diff options
| author |   Marek Szuba <marecki@gentoo.org> | 2023-02-07 11:28:43 +0000 |
|---|---|---|
| committer | Marek Szuba <marecki@gentoo.org> | 2023-02-07 11:28:43 +0000 |
| commit | 49bd23bbc1f76a9eaaf5159495cdd05f9fd10ff0 (patch) | |
| tree | 5f2dfa8bb8082ac3a6f5ad7ba1aad05645f70c09 /dev-libs | |
| parent | net-libs/tox: drop dev-libs/msgpack dependency (diff) | |
| download | gentoo-49bd23bbc1f76a9eaaf5159495cdd05f9fd10ff0.tar.gz gentoo-49bd23bbc1f76a9eaaf5159495cdd05f9fd10ff0.tar.bz2 gentoo-49bd23bbc1f76a9eaaf5159495cdd05f9fd10ff0.zip | |
dev-libs/msgpack: drop IUSE=static-libs support
The only revdep which used this has just ceased to do so, was a no-op in
3.3.0 to begin with.
Signed-off-by: Marek Szuba <marecki@gentoo.org>
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch | 38 | ||||
| -rw-r--r-- | dev-libs/msgpack/msgpack-3.3.0-r1.ebuild | 3 | ||||
| -rw-r--r-- | dev-libs/msgpack/msgpack-5.0.0.ebuild | 7 |
3 files changed, 2 insertions, 46 deletions
diff --git a/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch b/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch deleted file mode 100644 index e1ed2c2038a5..000000000000 --- a/dev-libs/msgpack/files/msgpack-5.0.0-static_libs.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -82,27 +82,6 @@ - OPTION (MSGPACK_GEN_COVERAGE "Enable running gcov to get a test coverage report." OFF) - ENDIF () - --IF (DEFINED BUILD_SHARED_LIBS) -- IF (BUILD_SHARED_LIBS) -- IF (DEFINED MSGPACK_ENABLE_SHARED AND NOT MSGPACK_ENABLE_SHARED) -- MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to ON by BUILD_SHARED_LIBS") -- ENDIF () -- SET (MSGPACK_ENABLE_SHARED ON) -- IF (DEFINED MSGPACK_ENABLE_STATIC AND MSGPACK_ENABLE_STATIC) -- MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to OFF by BUILD_SHARED_LIBS") -- ENDIF () -- SET (MSGPACK_ENABLE_STATIC OFF) -- ELSE () -- IF (DEFINED MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_SHARED) -- MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to OFF by BUILD_SHARED_LIBS") -- ENDIF () -- SET (MSGPACK_ENABLE_SHARED OFF) -- IF (DEFINED MSGPACK_ENABLE_STATIC AND NOT MSGPACK_ENABLE_STATIC) -- MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to ON by BUILD_SHARED_LIBS") -- ENDIF () -- SET (MSGPACK_ENABLE_STATIC ON) -- ENDIF () --ELSE () - IF (NOT DEFINED MSGPACK_ENABLE_SHARED) - SET (MSGPACK_ENABLE_SHARED ON) - ENDIF () -@@ -110,7 +89,6 @@ - SET (MSGPACK_ENABLE_STATIC ON) - ENDIF () - SET (BUILD_SHARED_LIBS ${MSGPACK_ENABLE_SHARED}) --ENDIF () - - INCLUDE (Files.cmake) - diff --git a/dev-libs/msgpack/msgpack-3.3.0-r1.ebuild b/dev-libs/msgpack/msgpack-3.3.0-r1.ebuild index db548946d8c3..4c9eb713672c 100644 --- a/dev-libs/msgpack/msgpack-3.3.0-r1.ebuild +++ b/dev-libs/msgpack/msgpack-3.3.0-r1.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="https://msgpack.org/ https://github.com/msgpack/msgpack-c/" LICENSE="Boost-1.0" SLOT="0/2" -IUSE="boost +cxx doc examples static-libs test" +IUSE="boost +cxx doc examples test" RESTRICT="!test? ( test )" BDEPEND="doc? ( app-doc/doxygen[dot] )" @@ -35,7 +35,6 @@ multilib_src_configure() { local mycmakeargs=( -DMSGPACK_BOOST="$(usex boost)" -DMSGPACK_ENABLE_CXX="$(usex cxx)" - -DMSGPACK_ENABLE_STATIC="$(usex static-libs)" -DMSGPACK_BUILD_TESTS="$(usex test)" # don't build the examples -DMSGPACK_BUILD_EXAMPLES=OFF diff --git a/dev-libs/msgpack/msgpack-5.0.0.ebuild b/dev-libs/msgpack/msgpack-5.0.0.ebuild index 14455fe7b732..cc6f586a055f 100644 --- a/dev-libs/msgpack/msgpack-5.0.0.ebuild +++ b/dev-libs/msgpack/msgpack-5.0.0.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/c-${PV}/${MY_P}.tar. LICENSE="Boost-1.0" SLOT="0/2" KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="doc examples static-libs test" +IUSE="doc examples test" RESTRICT="!test? ( test )" @@ -25,17 +25,12 @@ BDEPEND="doc? ( app-doc/doxygen[dot] ) sys-libs/zlib[${MULTILIB_USEDEP}] )" -PATCHES=( - "${FILESDIR}"/${PN}-5.0.0-static_libs.patch -) - S="${WORKDIR}"/${MY_P} multilib_src_configure() { local mycmakeargs=( -DMSGPACK_BUILD_EXAMPLES=OFF -DMSGPACK_BUILD_TESTS="$(usex test)" - -DMSGPACK_ENABLE_STATIC="$(usex static-libs)" ) cmake_src_configure |