From 3e304ccaa448131cffb39c57c89e3e4f6fa74ddc Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 31 Mar 2023 15:23:53 +0100 Subject: Ooops committed the wrong thing --- dev-libs/Ice/Ice-3.7.9-r1.ebuild | 6 +++--- dev-libs/Ice/Manifest | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-libs/Ice/Ice-3.7.9-r1.ebuild b/dev-libs/Ice/Ice-3.7.9-r1.ebuild index 641716e..447f5ee 100644 --- a/dev-libs/Ice/Ice-3.7.9-r1.ebuild +++ b/dev-libs/Ice/Ice-3.7.9-r1.ebuild @@ -52,7 +52,6 @@ PHP_EXT_S="${S}/php" PATCHES=( "${FILESDIR}/${P}-fix-musl-build.patch" - "${FILESDIR}/${P}-py3k11.patch" ) pkg_setup() { @@ -86,13 +85,14 @@ src_prepare() { } src_configure() { + CONFIGS+=("shared") + use c++0x && CONFIGS+=("cpp11-shared") MAKE_RULES=( "embedded_runpath_prefix=\"${EPREFIX}/usr\"" "OPTIMIZE=$(usex !debug)" + "configs=${CONFIGS[*]}" "V=1" ) - MAKE_RULES+=("shared") - use c++0x && MAKE_RULES+=("cpp11-shared") if use python; then local S="${S}/python" diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest index 8b1607d..47b162a 100644 --- a/dev-libs/Ice/Manifest +++ b/dev-libs/Ice/Manifest @@ -1,5 +1,5 @@ -AUX Ice-3.7.8-fix-musl-build.patch 568 BLAKE2B e320641208d46b27acc68d932aed336bf74407e3db8351e59b43172be771fe80ba813e01812a40b2cd57bd8002a0fe707f9a32fdef3f7b323c8a764f7f1c5c97 SHA512 be19a21ff3d4ddafb9d1b9c866f392b3eb081e450b9a061884485b7713f06ad5a7c58a0275328de8bdf39d0bfb2fcc085583105f47cae51e6cae42651a04ed3e -AUX Ice-3.7.8-py3k11.patch 1500 BLAKE2B c7580ff44b3d29071f48c72c00069e9689d8e6d354027469b70c14b249bc1b8c4b7453df02a4282066869b936a3f71e850d17a93444f1b192ccfb9998d8e632b SHA512 ebe4e8458785d4191f42fca81995f31c9e7d6e9290a91491ef311b2104c193161b5d3a8489a34630e0d42cb9dd3870e3f48fe8089b8f0739afbe822e1a9db4fb +AUX Ice-3.7.9-fix-musl-build.patch 568 BLAKE2B e320641208d46b27acc68d932aed336bf74407e3db8351e59b43172be771fe80ba813e01812a40b2cd57bd8002a0fe707f9a32fdef3f7b323c8a764f7f1c5c97 SHA512 be19a21ff3d4ddafb9d1b9c866f392b3eb081e450b9a061884485b7713f06ad5a7c58a0275328de8bdf39d0bfb2fcc085583105f47cae51e6cae42651a04ed3e +AUX Ice-3.7.9-py3k11.patch 1500 BLAKE2B c7580ff44b3d29071f48c72c00069e9689d8e6d354027469b70c14b249bc1b8c4b7453df02a4282066869b936a3f71e850d17a93444f1b192ccfb9998d8e632b SHA512 ebe4e8458785d4191f42fca81995f31c9e7d6e9290a91491ef311b2104c193161b5d3a8489a34630e0d42cb9dd3870e3f48fe8089b8f0739afbe822e1a9db4fb DIST Ice-3.7.1.pdf 9351739 BLAKE2B 527f2c37aea19aedbfc580efd93ce4fae2eb7264342bb485822593e2da6fb75a61eea2b1a46187898af07f138d10bf9a213d0b2a0685c18cd1d4c624709a935b SHA512 199b59f14b87b2896ba970bf5aa32f6fd858cbd3fed18eac93acafe4e296db1361ca2d2000ed49f3390ed66c1d4ff8c1fcd3f14ab8197d7804c87fce422c8486 DIST Ice-3.7.9.tar.gz 11098008 BLAKE2B f29013c0e58c83b26ee1b9c419a87a3e04e8e10a01220e2c0ab0e7cc2073cf4c6ad669ec73ccde8841272339557c54c29b94a91f2237760cc36b3f8336d43201 SHA512 07d7c439fbe1f69d808d05a11f32e09cdd8d4df2a93b6f253496304e0a521d417212ae688e316b4450dae406b59d1a460025b51ecd0614c69e48d86c0a6f81c5 -EBUILD Ice-3.7.9-r1.ebuild 6070 BLAKE2B e0e76cdf43357750bf1a45245bf04809f63e232d152348f7d6d58e01e703e5f5edf77538ce39688bf6e921ffb470c92f57cdb2a5fed4eaff028e80ee47c59a43 SHA512 86130166d6c97d8577a4be0f60fcad57edd487bb39f765f48cce7b7f4886bebf688367f995ccf5c7838ad9d6c840ab47e809fca296fc17db63f7a2dd07a329a3 +EBUILD Ice-3.7.9-r1.ebuild 6057 BLAKE2B 860a08c1bac86f866773a56bb0eb2eea7cd338083610da19cbdc66cc0d107f9186318bbe2fbd75edb67c04a6f383bf939502d2decee8e5b7ae51f9ac07b485a4 SHA512 ad9c9a7722a6095dd6b18c92a8825cad999c0b4960deec09c7da64a1e50125c405f0ba8eea47ea3b9032ef5757bb360afb428806e6036465664f57cee4f81aff -- cgit v1.2.3