diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
| commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
| tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-util/cmocka | |
| parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) | |
gentoo resync : 24.12.2018
Diffstat (limited to 'dev-util/cmocka')
| -rw-r--r-- | dev-util/cmocka/Manifest | 3 | ||||
| -rw-r--r-- | dev-util/cmocka/cmocka-1.1.3.ebuild | 19 | ||||
| -rw-r--r-- | dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch | 43 |
3 files changed, 56 insertions, 9 deletions
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest index 564aed0c7ae4..f7d0e8459b0d 100644 --- a/dev-util/cmocka/Manifest +++ b/dev-util/cmocka/Manifest @@ -1,5 +1,6 @@ +AUX cmocka-1.1.3-fix-doxygen.patch 1138 BLAKE2B 44ded90b04bcc9eae14f7332a840713767106039d6916479c8d0cfe502ccff60c08011be1c711dcdb827a391deb7976706d37c2ed3d3b3941370fa6b6481cc24 SHA512 63c00e774c3078ba784685887cd46790375b37bb957800951ecd1a82f5d2f29ec7c0fe77da8f4c7e9ff0a7860e801598b9dd231d43adcd460ca1d1c68a7a3f05 DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577 DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3 EBUILD cmocka-1.1.1.ebuild 1099 BLAKE2B 52977ce6645176f20b7c1359e6f34f2cae15f815f4af86f520a4c6174e8e364f081fdbe3ec6f5bab78897bed97319df95d3ae7e5f922de19a6d3eb6a532b5e7d SHA512 367a29b47190f086a336a774450b59a18e762fa2090ce1bab742adc83e6f8e114a2b31ec89c75b12f6acb90d97d93cf80edd64c4cb6e32a05b8a5885ee63d8e6 -EBUILD cmocka-1.1.3.ebuild 1107 BLAKE2B 10ad8cfdf272bdb65287e2dc49fb067adafc40cdbaf89d4e0b7c1912f103fb5aaba5699e676c28124c12d41434442a62caaf560644401843978352164b730298 SHA512 593faed506b82d1baabab9ceb1bcd1a13cab7112ce371de8f4995ab3aa1513c9a069bac00c162cc8450903a0a73daf0272d78dd9cfe6396d8cd45ae8c3e54104 +EBUILD cmocka-1.1.3.ebuild 1157 BLAKE2B 608ba23220624edb55ab18552ab34bbf434ef7d0eefe7988e38af37baa52fbf391c81e23b017d2f9cea939c3e1ffc17a3fb076e20bbf54de1fff2ca8125745dc SHA512 3b45a507eb49c1180169846f4eea24bbf38ba0091ebc26c4d89422eafc2c3f5641cfd5189e97110f7e77666ceb1d05b6956bd935947d737de38bda8a153b9dad MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6 diff --git a/dev-util/cmocka/cmocka-1.1.3.ebuild b/dev-util/cmocka/cmocka-1.1.3.ebuild index 6ae39d5ba5d4..4cdb5fbec971 100644 --- a/dev-util/cmocka/cmocka-1.1.3.ebuild +++ b/dev-util/cmocka/cmocka-1.1.3.ebuild @@ -15,12 +15,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~ IUSE="doc static-libs test" DEPEND=" - doc? ( app-doc/doxygen[latex] ) + doc? ( app-doc/doxygen[dot] ) " RDEPEND="" DOCS=( AUTHORS ChangeLog README.md ) +PATCHES=( + "${FILESDIR}/${P}-fix-doxygen.patch" # bug 671404 +) + multilib_src_configure() { local mycmakeargs=( -DWITH_STATIC_LIB=$(usex static-libs) @@ -32,15 +36,14 @@ multilib_src_configure() { cmake-utils_src_configure } +multilib_src_compile() { + cmake-utils_src_compile + multilib_is_native_abi && use doc && cmake-utils_src_compile docs +} + multilib_src_install() { if multilib_is_native_abi && use doc; then - pushd doc || die - doxygen Doxyfile || die - rm -f html/*.md5 latex/*.md5 latex/Manifest man/man3/_* || die - dodoc -r html/ - dodoc -r latex/ - doman man/man3/*.3 - popd || die + local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) fi cmake-utils_src_install diff --git a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch b/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch new file mode 100644 index 000000000000..c093021aa824 --- /dev/null +++ b/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch @@ -0,0 +1,43 @@ +From 1abfea55df24e83c2ea321b5f2b75e1a58963bc6 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@cryptomilk.org> +Date: Wed, 24 Oct 2018 16:33:39 +0200 +Subject: cmake: Fix doxygen generation + +Fixes #12 + +Signed-off-by: Andreas Schneider <asn@cryptomilk.org> +--- + CMakeLists.txt | 2 +- + doc/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 88408a9..7778039 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,9 +51,9 @@ if (MINGW) + endif (MINGW) + + # check subdirectories +-add_subdirectory(doc) + add_subdirectory(include) + add_subdirectory(src) ++add_subdirectory(doc) + + include(AddCMockaTest) + if (UNIT_TESTING) +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index a7bc65e..6ac7494 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -38,7 +38,7 @@ if (DOXYGEN_FOUND) + + doxygen_add_docs(docs + ${cmocka-library_SOURCE_DIR} +- ${cmocka-headers_SOURCE_DIR} ++ ${cmocka-header_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}) + endif(DOXYGEN_FOUND) + +-- +cgit v1.2.1 |