diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /dev-util/pkgconf | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'dev-util/pkgconf')
| -rw-r--r-- | dev-util/pkgconf/Manifest | 6 | ||||
| -rw-r--r-- | dev-util/pkgconf/pkgconf-1.6.3.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild (renamed from dev-util/pkgconf/pkgconf-1.7.3.ebuild) | 15 | ||||
| -rw-r--r-- | dev-util/pkgconf/pkgconf-9999.ebuild | 13 |
4 files changed, 19 insertions, 17 deletions
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest index 534c6a62b146..b1ca88c4a624 100644 --- a/dev-util/pkgconf/Manifest +++ b/dev-util/pkgconf/Manifest @@ -1,8 +1,8 @@ DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1 DIST pkgconf-1.7.2.tar.xz 292944 BLAKE2B dd0197afb75590e18b6ec8c76f9a7109edc3a0934b6b9ef7bf4006ffa73b0083d2a4aa120f2f3bd0a0e9d5fd564fd7d387aedeaa297fe72c63bc440518a51c6d SHA512 b0376178e93743fd844bdc94b5fa2678521ffe5022323e20f3c5196d500a87c3546d0edc2ac22e92cb528348116e2826d6f144bd7bd18d3f0afaa5cda74f25cd DIST pkgconf-1.7.3.tar.xz 293148 BLAKE2B b0fdad9e86c7e2aaf5f268de779730e55e14d6f0ddbec50f354b888aa9ca284f6d1d4c462f00b815cd6e0e17a3b41025ce77485f66a7d527f519a7b80283774d SHA512 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6 -EBUILD pkgconf-1.6.3.ebuild 1650 BLAKE2B 6411c28961a337ac9b48554a91df80d7ac108c2338b5159f4037bf8b585b987e793967316232c50d941583129ec6dc13f4a711c44bd5ff8a5f8512879fa90652 SHA512 f7cd4151e7317aa38c6df9220893493d741b3882ef89ceb437194f1bcf3df2e80b4c6a59b1ef75796f5aa8137aa40136b53c8f30a74c0f3841800f5d750f5814 +EBUILD pkgconf-1.6.3.ebuild 1667 BLAKE2B 17a7957cfa6994523620d43977f569d1e82c229ce67f478a3531e03b94bc40bbb0c1a76f1d01fe38b6369c700e0f8f79aa4c3aa92f4a9ef4cc1a0d139cb391f8 SHA512 bb283e3c29ca6bed10c5c4357c8e9456b7fc169881d8d708155e56bcfca2ebe5dc90a27f3e6c4b8a8289d6b15e7605d6faeafe651d8da0ed1e4ceaf1cd2eaef5 EBUILD pkgconf-1.7.2.ebuild 1676 BLAKE2B 415269c2b15399d877263b95ea77f56f065ec2fc4047228dabeeea5e65df62cf91a47cd23dfa2865a67101e419b36b63c88df2ea804c0ce7cf87d836dcaf0fb3 SHA512 367c84f00478c27a93e3be87243af32693a072fc7e12ecb2ff0d0baf08ddcc16c2ec080904c58c8fdf7864d04fd33e0a79284274d357dcd349d75258662a5139 -EBUILD pkgconf-1.7.3.ebuild 1676 BLAKE2B 415269c2b15399d877263b95ea77f56f065ec2fc4047228dabeeea5e65df62cf91a47cd23dfa2865a67101e419b36b63c88df2ea804c0ce7cf87d836dcaf0fb3 SHA512 367c84f00478c27a93e3be87243af32693a072fc7e12ecb2ff0d0baf08ddcc16c2ec080904c58c8fdf7864d04fd33e0a79284274d357dcd349d75258662a5139 -EBUILD pkgconf-9999.ebuild 1676 BLAKE2B 415269c2b15399d877263b95ea77f56f065ec2fc4047228dabeeea5e65df62cf91a47cd23dfa2865a67101e419b36b63c88df2ea804c0ce7cf87d836dcaf0fb3 SHA512 367c84f00478c27a93e3be87243af32693a072fc7e12ecb2ff0d0baf08ddcc16c2ec080904c58c8fdf7864d04fd33e0a79284274d357dcd349d75258662a5139 +EBUILD pkgconf-1.7.3-r1.ebuild 1777 BLAKE2B 80bea4f66676f4fae0d03f8b6e8cddd628c5c5bd6ec70384228906fcea57f15f03289cce73210903368741534b96f5b08e7a10363c33bbf7da601e55c123e699 SHA512 d1882bc7898119485ff5c133189146eb96478cc7f630d19931ca55208d38d6b703c557dc6f6265759d1b8f6e5a731b7e4534caa95395a99ccce50d0714dfecf4 +EBUILD pkgconf-9999.ebuild 1766 BLAKE2B c470aa4fc8eeb6c2e61c636eab8d9b1684eda76d1d7f2c5734e5159ae9ab4f905adbdb372166ba38ab13bc5bf83c92022c07023a0ca7ac512baa0c348086ff1a SHA512 c101e8a92926436c40a82da763c6a92a43e503b10014cd59ed202b1ea257de52f12e5c8d1bd91ea23aa07880e11a0bf8fbaea89009cf563fa9495e3b8b8a9efe MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10 diff --git a/dev-util/pkgconf/pkgconf-1.6.3.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild index 114a0bfd9d0a..1338eee18e3d 100644 --- a/dev-util/pkgconf/pkgconf-1.6.3.ebuild +++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild @@ -54,7 +54,7 @@ src_prepare() { multilib_src_configure() { local ECONF_SOURCE="${S}" - econf + econf --disable-static } multilib_src_test() { diff --git a/dev-util/pkgconf/pkgconf-1.7.3.ebuild b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild index 40e4e28319d4..858af22520ed 100644 --- a/dev-util/pkgconf/pkgconf-1.7.3.ebuild +++ b/dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf" else SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" fi DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" @@ -30,11 +30,7 @@ BDEPEND=" ) " RDEPEND=" - pkg-config? ( - !dev-util/pkgconfig - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config] - ) + pkg-config? ( !dev-util/pkgconfig ) " MULTILIB_CHOST_TOOLS=( @@ -54,7 +50,12 @@ src_prepare() { multilib_src_configure() { local ECONF_SOURCE="${S}" - econf --disable-static + local args=( + --disable-static + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + econf "${args[@]}" } multilib_src_test() { diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild index 40e4e28319d4..a29e166995b7 100644 --- a/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/dev-util/pkgconf/pkgconf-9999.ebuild @@ -30,11 +30,7 @@ BDEPEND=" ) " RDEPEND=" - pkg-config? ( - !dev-util/pkgconfig - !dev-util/pkg-config-lite - !dev-util/pkgconfig-openbsd[pkg-config] - ) + pkg-config? ( !dev-util/pkgconfig ) " MULTILIB_CHOST_TOOLS=( @@ -54,7 +50,12 @@ src_prepare() { multilib_src_configure() { local ECONF_SOURCE="${S}" - econf --disable-static + local args=( + --disable-static + --with-system-includedir="${EPREFIX}/usr/include" + --with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)" + ) + econf "${args[@]}" } multilib_src_test() { |