diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-09-04 20:23:42 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-09-04 20:23:42 +0000 |
| commit | a6e0a982f874bf8e7e93e164367ad9c0c127b4fc (patch) | |
| tree | 59cfdb2245356434b3f34ffdd190bab391547ca2 /eclass | |
| parent | What should have been 1.4.0 turned out not compatible with 1.4.0, so moved to... (diff) | |
| download | gentoo-2-a6e0a982f874bf8e7e93e164367ad9c0c127b4fc.tar.gz gentoo-2-a6e0a982f874bf8e7e93e164367ad9c0c127b4fc.tar.bz2 gentoo-2-a6e0a982f874bf8e7e93e164367ad9c0c127b4fc.zip | |
Make --no-uclibc work again.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/libtool.eclass | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index 13d21c9bebf6..94d719c537d8 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.55 2005/09/04 18:40:48 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.56 2005/09/04 20:23:42 azarah Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -121,17 +121,14 @@ elibtoolize() { local do_portage="no" local do_reversedeps="no" local do_only_patches="no" + local do_uclibc="yes" local deptoremove= local my_dirlist= - local elt_patches="portage relink max_cmd_len sed test tmp \ - uclibc-conf uclibc-ltconf" + local elt_patches="portage relink max_cmd_len sed test tmp" local start_dir="${PWD}" my_dirlist="$(ELT_find_ltmain_sh)" - [[ ${CHOST} == *"-freebsd"* ]] && \ - elt_patches="${elt_patches} fbsd-conf" - for x in "$@" ; do case "${x}" in "--portage") @@ -167,7 +164,7 @@ elibtoolize() { fi ;; "--no-uclibc") - NO_UCLIBCTOOLIZE=1 + do_uclibc="no" ;; *) eerror "Invalid elibtoolize option: $x" @@ -175,6 +172,12 @@ elibtoolize() { esac done + [[ ${do_uclibc} == "yes" ]] && \ + elt_patches="${elt_patches} uclibc-conf uclibc-ltconf" + + [[ ${CHOST} == *"-freebsd"* ]] && \ + elt_patches="${elt_patches} fbsd-conf" + if use ppc-macos ; then local opts [[ -f Makefile.am ]] && opts="--automake" |