From 8c364c784966be1700ea39ae45028f3e9be9cae0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 27 Mar 2018 22:40:05 +0100 Subject: gentoo resync : 27.03.2018 --- sys-devel/libtool/Manifest | 10 +- .../libtool/files/libtool-2.2.10-eprefix.patch | 4 +- .../files/libtool-2.4.6-libtoolize-slow.patch | 6 +- .../libtool/files/libtool-2.4.6-pthread.patch | 43 +++++++ .../files/libtool-2.4.6-pthread_bootstrapped.patch | 21 ++++ sys-devel/libtool/libtool-2.4.6-r2.ebuild | 93 ---------------- sys-devel/libtool/libtool-2.4.6-r5.ebuild | 124 +++++++++++++++++++++ sys-devel/libtool/libtool-9999.ebuild | 34 ++++-- 8 files changed, 222 insertions(+), 113 deletions(-) create mode 100644 sys-devel/libtool/files/libtool-2.4.6-pthread.patch create mode 100644 sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch delete mode 100644 sys-devel/libtool/libtool-2.4.6-r2.ebuild create mode 100644 sys-devel/libtool/libtool-2.4.6-r5.ebuild (limited to 'sys-devel/libtool') diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest index a837b654886e..52c94e31bda4 100644 --- a/sys-devel/libtool/Manifest +++ b/sys-devel/libtool/Manifest @@ -1,18 +1,20 @@ -AUX libtool-2.2.10-eprefix.patch 555 BLAKE2B ee6aba5e5a0ea1d26c6b2486b02e0ce069856374ec428d78b3fcec6b321de89b5c343105e44677388679737e34857e54440a65b3ad1751d863af2864be161b6f SHA512 f6630d840cd34a868fc9eebd6b8d5880ad2ba1c2f894a968179fce361e4d9d8eae71ad44d10eaf22a084fc19e7f476ef2f021665068506ca2e5df9a37536247c +AUX libtool-2.2.10-eprefix.patch 462 BLAKE2B d219aac1c2b68926a6c3c83bc85b51fe5e69cbbf76e3af096b024d649180f9cc4a025ceae14ada4ddb2b8836f669318a700b59811a4b44c91db82098099565bc SHA512 c9657a2726d0750241558337af57ac7d55afa4e74ac5eef411261394cbf7070b52876074367390ed5a2bbc09d9286ba200133ec6afd88a5fe5af08b8db04e189 AUX libtool-2.2.6a-darwin-module-bundle.patch 1202 BLAKE2B dfc1de3f09ceb164f757700e12c514ab5846a1bac8eb55b63fd27a24118ebcae36a9f7619eed3d63e02a2d5aff23efd1252975822fa136f5fd860b1172283152 SHA512 aca1cfbab9b1c9508f7fac85b346865106ce1f63d69095cd5b13e02f8d3605f04cd1142e077f19e4f6f8174cb9a9f39823061e494dfafc4fe4589c4e11120353 AUX libtool-2.4.3-use-linux-version-in-fbsd.patch 1124 BLAKE2B 69aad533a01e88a87ea73eade9e9c510ad2e72f0601839ff3872d7df854c186642f0a1ec0c0fc103369885588a6758f3050aca25cf577076ea512e5897d0a602 SHA512 6134fb39cf0e115a91cf69de175c9a088d405684139f8ba3dcf77f2c039e5f4603e2b70652f27bb59773aacb562560c1bcdbf439de1564bd19095d524b0ee5c7 AUX libtool-2.4.6-darwin-use-linux-version.patch 493 BLAKE2B 39c0b2e630fec412a3dbb31ab93ba1686496c7f0939f1f737e0ca929aded9c3f0b1b47102cdebccced9f7ac6107c02f10d772df9802152da03eae5c4fdefd97e SHA512 5cce0c85a59fef8c3c605e72f3f4a8a16c0ee2da464643c67fcf675fedfcb227866938fb98b1379506616b4141cca5b29175d976402510987053bade4fc482f9 AUX libtool-2.4.6-libtoolize-delay-help.patch 1591 BLAKE2B 0a2eef74ef726d71e425c5aa7d82018bf596db66baa5ea1e02db758d5bf74ade52edc482b1c4b62e7e986be20e73ae869818905954b0688c682fbad2ac1726f5 SHA512 19c160cc706081d63b65d6580fd8cb4d01e6a5e45652dd3c4fd83e71df5b765c355e861e257ab37489c2d4c78b4aa14bc94ad9718c91c90b467e4604f484b9c3 -AUX libtool-2.4.6-libtoolize-slow.patch 4665 BLAKE2B 81f66de01b96af14d3611c00c885a2acde7e36a241a7c00e4f6380dd96ee52d6b352ff45c0754cfc948c910eef7491ba50c5d056690a5a3719fe3e52d305b211 SHA512 d25506406c56a120b469b3b191d508f904c8336de4dd7be54c27e6582d6af1428afb8ebc2f56b98daae8e371bca3d56e2d8d9a8c428366597e4aa5425b13adb9 +AUX libtool-2.4.6-libtoolize-slow.patch 4659 BLAKE2B 79abc560d5e0654457a8ba26e0777bd91b4e15ad0b33e689709d31d12b6b28bed54285d3688d04a45bae4bb9c6c6d99862219335ab7cd2f7a3cdb5f237fc3f21 SHA512 a98333983a493b27f4188b83d75548abc63c1d50720a8720d47a1f88f231331de078a78440f0f0569e6aeb646b14f16db26a7eefd20fdac6fc7321b9428ddbfd AUX libtool-2.4.6-link-fsanitize.patch 2364 BLAKE2B 97cbf349945c315000d694f5f156835078f079998d568ebfdd1a9a664300fcbcc1a785e34cec535ffa3ac4c902cc5095517f4f0b0b8575cd66d2dbd47251bc1c SHA512 567487334e4084b94f0431561213ac520a7871a0acb904b019204e728b750a8ab8155b88f0b5a90cefdd5f524130f9f3f9f0de34d8d9a2bd821bb8be6266cf69 AUX libtool-2.4.6-link-fuse-ld.patch 2365 BLAKE2B 806e47a27b0c73bcf67d1d1cf00412eb0114cb71955bf3248eb9529b3c73a5730bcb4c0887e441cd72ec6c8111ade8e72d765b6e5d9586e643d37a8e155f6809 SHA512 273f9bef6dffc50f9773a8a91101d13ed2a13c72e077c4620f1e3da37b27271acb005fdcde7bcd9acc7cfcb1ee71ec2cb3eba3c9fcf262eb141e12f43fd06b6e AUX libtool-2.4.6-link-specs.patch 2438 BLAKE2B 99dcefe58ea905e89d7169b926ed9d9f186c5603c84f262a1feff3a926a26aa839d205e47dacbfa87cadd118d8940ac58d60fba4a9ed19e019dfb838d1094c42 SHA512 349675e58a82227930859d7ced1f7bafc7b05f3d4d902e4bfec3f4f1337c7a724ff7d8f509da4212c74c6f4c07b7f3604a6c28070ca5091543a8c4616e0263c9 AUX libtool-2.4.6-mint.patch 1672 BLAKE2B 0a7eee18610dd1126d058360f8fdadb190c6f3cb37c3c4bfc17617a06330fab5ad6f6dea7a027777d112ac19ea06586e42d907a0e8bb2a6f929188ffb34bc75a SHA512 a022703b39596ca5aafd27f463aee403c2d4565d3283c0ea20c259996c3d32056096536bbec079e3ed08b03618f9d5e46c0684db08c90477fe31e4219596e22b AUX libtool-2.4.6-ppc64le.patch 3672 BLAKE2B 1c1f068f0f1ab8b8180a98412e6a3bb1e4cc84c3e9c8894b4a0a2f8e110ea7ce198fc02d07ba2f18023cf38696d8cfd46e9fae979d5ab30ace2c82b020493f34 SHA512 e9dc9fad5eebabcc65506dddabf3a917c73237485f2ad24765a20437404f654a8c04411755381c7c5d90c2ae13cabd5d89f9ad15839e2e1b9d43300d57adf178 +AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b2019cb63b4901b6de68f5efcfe9d42dbaafd7c40ea03f1b247cea8718ef92a51c1bd0ce429ec49665f05a61e26d25fa SHA512 037cf598c644d167de5fef9f4ecee6ccd573d2516f2f777eeaad94135ff05dd0775191d3e21cca397bb664bc0449a5db0b9ef0bbaa16e178762be9769c13c31e +AUX libtool-2.4.6-pthread_bootstrapped.patch 556 BLAKE2B a381e0a8d8c585f6f79cd2f15d473f4cd46dec0cf28657a4fa695efaad4bbfc963cc71fc5d8a4681a7a9f3e789b41c6e281329dae3117df2ec4c14a2cf5ca051 SHA512 22d7ba329f7e4c6a9b157f460e2076f1a08cd8f16fc68572c3f07b9ee10f8249855b2d7044be33710ce5ef1fecca3db351dd587001940cb834f9351f901df7fb AUX libtool-2.4.6-sed-quote-speedup.patch 8262 BLAKE2B c9194732921aa28713c9e0019d5e9de7e1ad2d6a18059c0f7681b0d683bdf460bb8257381269e8193ead866f26af000a6bddfc7c56410f7fde94fbf32bdbe8af SHA512 d4a1ab01e1d6f3b05221bded3fc7c8204e686b1ac11dc00267a7a75a6759adfa8ac3d7041dc5710084031c7fe47f2deb88bc9c23e3502a944a97244942529927 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4 -EBUILD libtool-2.4.6-r2.ebuild 2535 BLAKE2B 2eb8c6af51a7cd877c551cd043270093d72d3cbc3c49400b04fe207d71277ad55d297a5aa4ae59c2c5551b9816a0ca7bade9423546415be3f6dcc6367c305748 SHA512 b442d24c09ecd6d1784f216fdb40b973aa1e909e82436d92a451623ef3d4f30d6ca3d5c2b62b3ed39eedf1d7bc2713a574163cc783189f5d754b020a6edbd036 EBUILD libtool-2.4.6-r3.ebuild 2584 BLAKE2B e646f26bcff36576129496e8a16f5e9d7ca2ed4f6b65c20a194fe479d9808d838851baf5c3ec376eae28bb65336d97d5afaf20bdcc993115259e1957fcdefbb7 SHA512 f5f1e55abcab7a7620e945d1cf2b4dc1e21b773c1ca63dc6ac63bd16e811e2dcd17ac794b984cc32f7ee2b7ead849673bc3aeb52e93a171ecd886a437c65e0e1 EBUILD libtool-2.4.6-r4.ebuild 3544 BLAKE2B 93e11375702db5b7a64d739ba4ee720692e72a0067975dc5b811d78aaf8d94d45eacd7acbb60abed3a66ce75a47fb5395d585c0ea28288fab0ae5a354c84ce78 SHA512 31b78fdc2d1ac2a845ec8d3aaf318d048c74a28a6d6727f93e3c2cf96304102ecd9528cc21c4f39a0da3c30dbed8f325fc8d3d0528cfb004c5591663296f701f -EBUILD libtool-9999.ebuild 3186 BLAKE2B bb0a808f342687208196b3e4bfff28031723baaf8cc95ef9060d2260ad52b546d583e7d09cf2c6fe72f87eb2e2960875e17b82128135d2bbc78b47f11e10e511 SHA512 a71dfbd53e4fe1de1ab5e502f020e571007ce92d99fc2f367d4fc801bc11c6effd26c7b63449614496dbecba1217e85a753bec1455c1637c7771155afda47a0c +EBUILD libtool-2.4.6-r5.ebuild 3649 BLAKE2B 75ed58e77931b898d174a90aa6e5491bc065d8b8ea0de48f1eb60031e5426f779fcaf7b19d7afffaf02a4b1fff1e15efd90c28870a94ff3eaee32a1bfb052fb4 SHA512 23d29e41c0f6d08c28572ccc1ab31a4253da9c24e35f859dc1116217aef30b0bf9681a76b05879f51fe880de1767062cb236600fe75c1ad30af480b1925168d0 +EBUILD libtool-9999.ebuild 3338 BLAKE2B e5122e24f3a92bcad40e1007a39656aaad5b7ca9ae15c171a4e00953771f91d98063fd05ca33115a25352e8d1e9073218efe74861fd9d48a285f94e2883e042e SHA512 7308be87b811707bdbce23ead476a7bf23857a836d79293b9b036e52d78bf8647f2acc41683658f2215d85a437ba7a0bafc79a3c043d40b0f151357502819c6a MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-devel/libtool/files/libtool-2.2.10-eprefix.patch b/sys-devel/libtool/files/libtool-2.2.10-eprefix.patch index 5a2980d2979d..c4693ee7feeb 100644 --- a/sys-devel/libtool/files/libtool-2.2.10-eprefix.patch +++ b/sys-devel/libtool/files/libtool-2.2.10-eprefix.patch @@ -1,5 +1,5 @@ ---- ./libltdl/m4/libtool.m4.orig 2010-07-02 12:41:07.000000000 +0200 -+++ ./libltdl/m4/libtool.m4 2010-07-02 12:45:39.000000000 +0200 +--- a/m4/libtool.m4 ++++ b/m4/libtool.m4 @@ -2087,7 +2087,7 @@ mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; diff --git a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch b/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch index abddee13dc30..d27f976ccb40 100644 --- a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch +++ b/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch @@ -37,13 +37,13 @@ Signed-off-by: Pavel Raiskup NEWS | 4 ++++ NO-THANKS | 1 + bootstrap | 42 +++++++++++++++++++++++++++--------------- - gl/build-aux/extract-trace | 42 +++++++++++++++++++++++++++--------------- + build-aux/extract-trace | 42 +++++++++++++++++++++++++++--------------- 4 files changed, 59 insertions(+), 30 deletions(-) diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace index 315a32a..c6abd21 100755 ---- a/gl/build-aux/extract-trace -+++ b/gl/build-aux/extract-trace +--- a/build-aux/extract-trace ++++ b/build-aux/extract-trace @@ -329,29 +329,41 @@ func_extract_trace () # arguments to Autocof functions, but without following # 'm4_s?include' files. diff --git a/sys-devel/libtool/files/libtool-2.4.6-pthread.patch b/sys-devel/libtool/files/libtool-2.4.6-pthread.patch new file mode 100644 index 000000000000..49b81c1dcda6 --- /dev/null +++ b/sys-devel/libtool/files/libtool-2.4.6-pthread.patch @@ -0,0 +1,43 @@ +http://permalink.gmane.org/gmane.comp.gnu.libtool.patches/11704 +https://bugs.gentoo.org/650876 + +From: Pavel Raiskup redhat.com> +Subject: [PATCH] libtool: handle the -pthread{,s} options for g++ +Newsgroups: gmane.comp.gnu.libtool.patches +Date: Thursday 28th November 2013 14:18:05 UTC (over 4 years ago) + +As we are forced to pass -nostdlib to g++ for linking, this option +expectedly disables the effectiveness of passed -pthread flag - so +add the -lpthread explicitly to $deplibs to link correctly. + +References: +http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460 +https://bugzilla.redhat.com/show_bug.cgi?id=661333 +http://lists.gnu.org/archive/html/bug-libtool/2013-01/msg00018.htm + +* build-aux/ltmain.in (func_mode_link): Explicitly add -lpthread +flag into $deplibs when -pthread is passed (for g++ only). +--- + build-aux/ltmain.in | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in +index fba05c1..f202b80 100644 +--- a/build-aux/ltmain.in ++++ b/build-aux/ltmain.in +@@ -5113,6 +5113,16 @@ func_mode_link () + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac ++ ++ # As we are forced to pass -nostdlib to g++ during linking, the option ++ # -pthread{,s} is not in effect; add the -lpthread to $deplist ++ # explicitly to link correctly. ++ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then ++ case "$arg" in ++ -pthread*) func_append deplibs " -lpthread" ;; ++ esac ++ fi ++ + continue + ;; diff --git a/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch b/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch new file mode 100644 index 000000000000..54461ccc54ee --- /dev/null +++ b/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/650876 + +--- libtool-2.4.6/build-aux/ltmain.sh ++++ libtool-2.4.6/build-aux/ltmain.sh +@@ -7079,6 +7079,16 @@ + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac ++ ++ # As we are forced to pass -nostdlib to g++ during linking, the option ++ # -pthread{,s} is not in effect; add the -lpthread to $deplist ++ # explicitly to link correctly. ++ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then ++ case "$arg" in ++ -pthread*) func_append deplibs " -lpthread" ;; ++ esac ++ fi ++ + continue + ;; + diff --git a/sys-devel/libtool/libtool-2.4.6-r2.ebuild b/sys-devel/libtool/libtool-2.4.6-r2.ebuild deleted file mode 100644 index 162264fa654c..000000000000 --- a/sys-devel/libtool/libtool-2.4.6-r2.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -LIBTOOLIZE="true" #225559 -WANT_LIBTOOL="none" -inherit autotools epatch epunt-cxx multilib unpacker - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git - http://git.savannah.gnu.org/r/${PN}.git" - inherit git-2 -else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -fi - -DESCRIPTION="A shared library tool for developers" -HOMEPAGE="https://www.gnu.org/software/libtool/" - -LICENSE="GPL-2" -SLOT="2" -IUSE="vanilla" - -# Pull in libltdl directly until we convert packages to the new dep. -RDEPEND="sys-devel/gnuconfig - >=sys-devel/autoconf-2.69 - >=sys-devel/automake-1.13 - dev-libs/libltdl:0 - !/dev/null - AT_NOELIBTOOLIZE=yes eautoreconf - popd >/dev/null - AT_NOELIBTOOLIZE=yes eautoreconf - epunt_cxx - - # Make sure timestamps don't trigger a rebuild of man pages. #556512 - if [[ ${PV} != "9999" ]] ; then - touch doc/*.1 - export HELP2MAN=false - fi -} - -src_configure() { - # the libtool script uses bash code in it and at configure time, tries - # to find a bash shell. if /bin/sh is bash, it uses that. this can - # cause problems for people who switch /bin/sh on the fly to other - # shells, so just force libtool to use /bin/bash all the time. - export CONFIG_SHELL=/bin/bash - - # Do not bother hardcoding the full path to sed. Just rely on $PATH. #574550 - export ac_cv_path_SED=$(basename "$(type -P sed)") - - ECONF_SOURCE=${S} econf --disable-ltdl-install -} - -src_test() { - emake check -} - -src_install() { - default - - local x - while read -d $'\0' -r x ; do - ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die - done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0) -} diff --git a/sys-devel/libtool/libtool-2.4.6-r5.ebuild b/sys-devel/libtool/libtool-2.4.6-r5.ebuild new file mode 100644 index 000000000000..710968a99a5d --- /dev/null +++ b/sys-devel/libtool/libtool-2.4.6-r5.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +LIBTOOLIZE="true" #225559 +WANT_LIBTOOL="none" +inherit autotools epatch epunt-cxx multilib unpacker prefix + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git + http://git.savannah.gnu.org/r/${PN}.git" + inherit git-r3 +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +fi + +DESCRIPTION="A shared library tool for developers" +HOMEPAGE="https://www.gnu.org/software/libtool/" + +LICENSE="GPL-2" +SLOT="2" +IUSE="vanilla" + +# Pull in libltdl directly until we convert packages to the new dep. +RDEPEND="sys-devel/gnuconfig + >=sys-devel/autoconf-2.69 + >=sys-devel/automake-1.13 + dev-libs/libltdl:0 + !/dev/null + AT_NOELIBTOOLIZE=yes eautoreconf + popd >/dev/null + AT_NOELIBTOOLIZE=yes eautoreconf + epunt_cxx + + # Make sure timestamps don't trigger a rebuild of man pages. #556512 + if [[ ${PV} != "9999" ]] ; then + touch doc/*.1 + export HELP2MAN=false + fi +} + +src_configure() { + # the libtool script uses bash code in it and at configure time, tries + # to find a bash shell. if /bin/sh is bash, it uses that. this can + # cause problems for people who switch /bin/sh on the fly to other + # shells, so just force libtool to use /bin/bash all the time. + export CONFIG_SHELL="$(type -P bash)" + + # Do not bother hardcoding the full path to sed. Just rely on $PATH. #574550 + export ac_cv_path_SED="$(basename "$(type -P sed)")" + + local myconf + [[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g" + ECONF_SOURCE=${S} econf ${myconf} --disable-ltdl-install +} + +src_test() { + emake check +} + +src_install() { + default + + local x + while read -d $'\0' -r x ; do + ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die + done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0) +} diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild index 13af7fa0f519..140bf7a5cb41 100644 --- a/sys-devel/libtool/libtool-9999.ebuild +++ b/sys-devel/libtool/libtool-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 LIBTOOLIZE="true" #225559 WANT_LIBTOOL="none" -inherit autotools epatch epunt-cxx multilib unpacker prefix +inherit autotools epunt-cxx multilib unpacker prefix if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git @@ -33,23 +33,35 @@ DEPEND="${RDEPEND} app-arch/xz-utils" [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man" +PATCHES=( + "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105 + "${FILESDIR}"/${PN}-2.4.6-mint.patch + "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch + "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch +) + src_unpack() { if [[ ${PV} == "9999" ]] ; then git-r3_src_unpack - cd "${S}" - ./bootstrap || die else unpacker_src_unpack fi } src_prepare() { + if [[ "${PV}" = 9999 ]] ; then + eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch #650876 + ./bootstrap || die + else + PATCHES+=( + "${FILESDIR}"/${P}-pthread_bootstrapped.patch #650876 + ) + fi + use vanilla && return 0 - epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105 - epatch "${FILESDIR}"/${PN}-2.4.6-mint.patch - epatch "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch - epatch "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch + default + if use prefix ; then # seems that libtool has to know about EPREFIX a little bit # better, since it fails to find prefix paths to search libs @@ -58,7 +70,7 @@ src_prepare() { # (argh...). This could also be fixed by making the gcc wrapper # return the correct result for -print-search-dirs (doesn't # include prefix dirs ...). - epatch "${FILESDIR}"/${PN}-2.2.10-eprefix.patch + eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch eprefixify m4/libtool.m4 fi pushd libltdl >/dev/null @@ -79,10 +91,10 @@ src_configure() { # to find a bash shell. if /bin/sh is bash, it uses that. this can # cause problems for people who switch /bin/sh on the fly to other # shells, so just force libtool to use /bin/bash all the time. - export CONFIG_SHELL=$(type -P bash) + export CONFIG_SHELL="$(type -P bash)" # Do not bother hardcoding the full path to sed. Just rely on $PATH. #574550 - export ac_cv_path_SED=$(basename "$(type -P sed)") + export ac_cv_path_SED="$(basename "$(type -P sed)")" local myconf [[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g" -- cgit v1.2.3