Skip to content

Instantly share code, notes, and snippets.

@ilovezfs
Last active August 29, 2015 14:03
Show Gist options
  • Save ilovezfs/da3cbc259de916dcd4fa to your computer and use it in GitHub Desktop.
Save ilovezfs/da3cbc259de916dcd4fa to your computer and use it in GitHub Desktop.
libtool-2.4.2-r1 fix multilib
--- libtool-2.4.2-r1.ebuild 2014-07-06 10:35:04.000000000 -0700
+++ libtool-2.4.2-r1.ebuild 2014-07-07 06:45:37.000000000 -0700
@@ -92,9 +92,6 @@
cd ..
AT_NOELIBTOOLIZE=yes eautoreconf
epunt_cxx
-}
-
-multilib_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
@@ -104,7 +101,6 @@
local myconf
# usr/bin/libtool is provided by binutils-apple
[[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g"
- ECONF_SOURCE="${S}" \
econf ${myconf} $(use_enable static-libs static) || die
# Bootstrap host-libtool using this very $P.
@@ -127,8 +123,18 @@
# ${CHOST}-libtool for cross-compiling. Keeping this one for now to
# prevent the need for creating another sys-devel package in Prefix.
cp libtool "${S}" || die
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myconf
+ # usr/bin/libtool is provided by binutils-apple
+ [[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g"
+ econf ${myconf} $(use_enable static-libs static) || die
}
+
multilib_src_install_all() {
dodoc AUTHORS ChangeLog* NEWS README THANKS TODO doc/PLATFORMS
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment