public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cmocka/files/, dev-util/cmocka/
@ 2018-07-11 13:28 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-07-11 13:28 UTC (permalink / raw
  To: gentoo-commits

commit:     59b9341632d8e4c944577be4f040f4c3fcb053c9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 11 13:23:26 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 11 13:27:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59b93416

dev-util/cmocka: Drop old

Closes: https://bugs.gentoo.org/657262
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/cmocka/Manifest                           |  1 -
 dev-util/cmocka/cmocka-1.0.1.ebuild                | 47 ------------------
 .../cmocka-1.0.1-fix-librt-configure-issue.patch   | 56 ----------------------
 3 files changed, 104 deletions(-)

diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index dd6645e1f76..075e38d43da 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,2 +1 @@
-DIST cmocka-1.0.1.tar.xz 80240 BLAKE2B eb6baae44e75c3237038dfd32bb2844ed368eba7e2b7c8ddef82984d6b4b086b1667a5d021355d918be7ff63306629e7c6286c2f0ee4f5977362d96b6a9363d5 SHA512 142b3293a8ab137904d07f1ac6a56daf0afbbfcf7816a582c9998b6225aa5d6fe5f2d1b889de7b187142fc24ca4d1cfdbd630e8783858bc9ce89217ff05abc1e
 DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577

diff --git a/dev-util/cmocka/cmocka-1.0.1.ebuild b/dev-util/cmocka/cmocka-1.0.1.ebuild
deleted file mode 100644
index 2c38c69694b..00000000000
--- a/dev-util/cmocka/cmocka-1.0.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-multilib
-
-DESCRIPTION="A unit testing framework for C"
-HOMEPAGE="https://cmocka.org/"
-SRC_URI="https://cmocka.org/files/1.0/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc static-libs test"
-
-DEPEND="
-	doc? ( app-doc/doxygen[latex] )
-"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-fix-librt-configure-issue.patch" )
-
-DOCS=( AUTHORS ChangeLog README )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with static-libs STATIC_LIB)
-		$(cmake-utils_use test UNIT_TESTING)
-		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
-			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
-	)
-	cmake-utils_src_configure
-}
-
-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
-		dohtml html/*
-		dodoc latex/*
-		doman man/man3/*.3
-		popd || die
-	fi
-	cmake-utils_src_install
-}

diff --git a/dev-util/cmocka/files/cmocka-1.0.1-fix-librt-configure-issue.patch b/dev-util/cmocka/files/cmocka-1.0.1-fix-librt-configure-issue.patch
deleted file mode 100644
index 2bafd901076..00000000000
--- a/dev-util/cmocka/files/cmocka-1.0.1-fix-librt-configure-issue.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b2732b52202ae48f866a024c633466efdbb8e85a Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Thu, 3 Mar 2016 09:12:21 +0100
-Subject: cmake: Fix possible issues with librt during configure
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- ConfigureChecks.cmake | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index c2064dd..31c5a94 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -100,11 +100,9 @@ else (WIN32)
- endif (WIN32)
- 
- find_library(RT_LIBRARY rt)
--if (RT_LIBRARY)
--    set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY})
--endif (RT_LIBRARY)
--
--set(CMOCKA_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "cmocka required system libraries")
-+if (RT_LIBRARY AND NOT LINUX)
-+    set(CMOCKA_REQUIRED_LIBRARIES ${RT_LIBRARY} CACHE INTERNAL "cmocka required system libraries")
-+endif ()
- 
- # OPTIONS
- check_c_source_compiles("
-@@ -124,9 +122,10 @@ int main(void) {
- endif(WIN32)
- 
- if (HAVE_TIME_H AND HAVE_STRUCT_TIMESPEC AND HAVE_CLOCK_GETTIME)
--    set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY})
-+    if (RT_LIBRARY)
-+        set(CMAKE_REQUIRED_LIBRARIES ${RT_LIBRARY})
-+    endif()
- 
--    message(STATUS "CMAKE_REQUIRED_INCLUDES=${CMAKE_REQUIRED_INCLUDES} CMAKE_REQUIRED_LIBRARIES=${CMAKE_REQUIRED_LIBRARIES}")
-     check_c_source_compiles("
- #include <time.h>
- 
-@@ -137,7 +136,10 @@ int main(void) {
- 
-     return 0;
- }" HAVE_CLOCK_GETTIME_REALTIME)
-+
-+    # reset cmake requirements
-     set(CMAKE_REQUIRED_INCLUDES)
-+    set(CMAKE_REQUIRED_LIBRARIES)
- endif ()
- 
- # ENDIAN
--- 
-cgit v0.12
-


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cmocka/files/, dev-util/cmocka/
@ 2018-11-27  7:49 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-11-27  7:49 UTC (permalink / raw
  To: gentoo-commits

commit:     04c9f723291d93383f60f576a177d7cefddd8ab7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 27 00:18:17 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 27 07:48:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04c9f723

dev-util/cmocka: Fix USE doc

Closes: https://bugs.gentoo.org/671404
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/cmocka/cmocka-1.1.3.ebuild                | 19 ++++++----
 .../cmocka/files/cmocka-1.1.3-fix-doxygen.patch    | 43 ++++++++++++++++++++++
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/dev-util/cmocka/cmocka-1.1.3.ebuild b/dev-util/cmocka/cmocka-1.1.3.ebuild
index 6ae39d5ba5d..c98c2e9957e 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 && 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 00000000000..c093021aa82
--- /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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cmocka/files/, dev-util/cmocka/
@ 2019-01-24 22:59 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-01-24 22:59 UTC (permalink / raw
  To: gentoo-commits

commit:     30c33c07c94332463b72487288d5b02372e64190
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 24 22:32:32 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 22:59:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c33c07

dev-util/cmocka: Add USE examples, EAPI-7 bump

Bug: https://bugs.gentoo.org/675876
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/cmocka/cmocka-1.1.3.ebuild               | 13 ++++---
 dev-util/cmocka/files/cmocka-1.1.3-examples.patch | 45 +++++++++++++++++++++++
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/dev-util/cmocka/cmocka-1.1.3.ebuild b/dev-util/cmocka/cmocka-1.1.3.ebuild
index 4cdb5fbec97..8153e29cfdb 100644
--- a/dev-util/cmocka/cmocka-1.1.3.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.3.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-multilib
 
-DESCRIPTION="A unit testing framework for C"
+DESCRIPTION="Unit testing framework for C"
 HOMEPAGE="https://cmocka.org/"
 SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc static-libs test"
+IUSE="doc examples static-libs test"
 
-DEPEND="
+BDEPEND="
 	doc? ( app-doc/doxygen[dot] )
 "
-RDEPEND=""
 
 DOCS=( AUTHORS ChangeLog README.md )
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-doxygen.patch" # bug 671404
+	"${FILESDIR}/${P}-examples.patch"
 )
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DWITH_EXAMPLES=$(usex examples)
 		-DWITH_STATIC_LIB=$(usex static-libs)
 		-DUNIT_TESTING=$(usex test)
 		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \

diff --git a/dev-util/cmocka/files/cmocka-1.1.3-examples.patch b/dev-util/cmocka/files/cmocka-1.1.3-examples.patch
new file mode 100644
index 00000000000..3d5fcc8098f
--- /dev/null
+++ b/dev-util/cmocka/files/cmocka-1.1.3-examples.patch
@@ -0,0 +1,45 @@
+From ee264da1aa222b354cee36184ab48c2072f62243 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Wed, 23 Jan 2019 11:20:31 +0100
+Subject: [PATCH] cmake: Add WITH_EXAMPLES options
+
+This is turned on by default, but you can disable it, if you just
+package cmocka for an opterating system.
+
+Fixes #14
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ CMakeLists.txt      | 4 +++-
+ DefineOptions.cmake | 1 +
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7778039..702be97 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,7 +60,9 @@ if (UNIT_TESTING)
+     add_subdirectory(tests)
+ endif (UNIT_TESTING)
+ 
+-add_subdirectory(example)
++if (WITH_EXAMPLES)
++    add_subdirectory(example)
++endif ()
+ 
+ # pkg-config file
+ configure_file(cmocka.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmocka.pc)
+diff --git a/DefineOptions.cmake b/DefineOptions.cmake
+index 5bc1ef3..911ff1d 100644
+--- a/DefineOptions.cmake
++++ b/DefineOptions.cmake
+@@ -1,5 +1,6 @@
+ option(WITH_STATIC_LIB "Build with a static library" OFF)
+ option(WITH_CMOCKERY_SUPPORT "Install a cmockery header" OFF)
++option(WITH_EXAMPLES "Build examples" ON)
+ option(UNIT_TESTING "Build with unit testing" OFF)
+ option(PICKY_DEVELOPER "Build with picky developer flags" OFF)
+ 
+-- 
+2.18.1
+


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cmocka/files/, dev-util/cmocka/
@ 2019-07-28 21:21 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-07-28 21:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4d84148a84abd331b7645b4de1b31621dec37615
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 21:07:17 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 21:20:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d84148a

dev-util/cmocka: Drop 1.1.3

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-util/cmocka/Manifest                           |  1 -
 dev-util/cmocka/cmocka-1.1.3.ebuild                | 51 ----------------------
 dev-util/cmocka/files/cmocka-1.1.3-examples.patch  | 45 -------------------
 .../cmocka/files/cmocka-1.1.3-fix-doxygen.patch    | 43 ------------------
 4 files changed, 140 deletions(-)

diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 1709a3dcbbe..06a150ece92 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,2 +1 @@
-DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd

diff --git a/dev-util/cmocka/cmocka-1.1.3.ebuild b/dev-util/cmocka/cmocka-1.1.3.ebuild
deleted file mode 100644
index 59978fb7fdf..00000000000
--- a/dev-util/cmocka/cmocka-1.1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Unit testing framework for C"
-HOMEPAGE="https://cmocka.org/"
-SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-doxygen.patch" # bug 671404
-	"${FILESDIR}/${P}-examples.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_STATIC_LIB=$(usex static-libs)
-		-DUNIT_TESTING=$(usex test)
-		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
-			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
-	)
-
-	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
-		local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	fi
-
-	cmake-utils_src_install
-}

diff --git a/dev-util/cmocka/files/cmocka-1.1.3-examples.patch b/dev-util/cmocka/files/cmocka-1.1.3-examples.patch
deleted file mode 100644
index 3d5fcc8098f..00000000000
--- a/dev-util/cmocka/files/cmocka-1.1.3-examples.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ee264da1aa222b354cee36184ab48c2072f62243 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Wed, 23 Jan 2019 11:20:31 +0100
-Subject: [PATCH] cmake: Add WITH_EXAMPLES options
-
-This is turned on by default, but you can disable it, if you just
-package cmocka for an opterating system.
-
-Fixes #14
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- CMakeLists.txt      | 4 +++-
- DefineOptions.cmake | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7778039..702be97 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,7 +60,9 @@ if (UNIT_TESTING)
-     add_subdirectory(tests)
- endif (UNIT_TESTING)
- 
--add_subdirectory(example)
-+if (WITH_EXAMPLES)
-+    add_subdirectory(example)
-+endif ()
- 
- # pkg-config file
- configure_file(cmocka.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmocka.pc)
-diff --git a/DefineOptions.cmake b/DefineOptions.cmake
-index 5bc1ef3..911ff1d 100644
---- a/DefineOptions.cmake
-+++ b/DefineOptions.cmake
-@@ -1,5 +1,6 @@
- option(WITH_STATIC_LIB "Build with a static library" OFF)
- option(WITH_CMOCKERY_SUPPORT "Install a cmockery header" OFF)
-+option(WITH_EXAMPLES "Build examples" ON)
- option(UNIT_TESTING "Build with unit testing" OFF)
- option(PICKY_DEVELOPER "Build with picky developer flags" OFF)
- 
--- 
-2.18.1
-

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
deleted file mode 100644
index c093021aa82..00000000000
--- a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-28 21:21 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-27  7:49 [gentoo-commits] repo/gentoo:master commit in: dev-util/cmocka/files/, dev-util/cmocka/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2019-07-28 21:21 Andreas Sturmlechner
2019-01-24 22:59 Andreas Sturmlechner
2018-07-11 13:28 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox