diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-02-18 18:04:42 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-02-18 18:04:42 +0000 |
| commit | badcb29a9513967727f9c7c5a154f63040af91eb (patch) | |
| tree | 0b397e960e7397b3122ff16313fbe54f1b90a5de /eclass | |
| parent | stable on x86 amd64 ia64 alpha (diff) | |
| download | gentoo-2-badcb29a9513967727f9c7c5a154f63040af91eb.tar.gz gentoo-2-badcb29a9513967727f9c7c5a154f63040af91eb.tar.bz2 gentoo-2-badcb29a9513967727f9c7c5a154f63040af91eb.zip | |
Fix reverse logic when checking if we should run fix_libtool_files.sh.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 4 | ||||
| -rw-r--r-- | eclass/games.eclass | 9 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 893c2f2f9051..cac8d503127b 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.151 2005/02/11 22:56:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.152 2005/02/18 18:04:42 azarah Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -461,6 +461,8 @@ have_NPTL() { get_number_of_jobs() { local jobs=0 + return 0 + if [ ! -r /proc/cpuinfo ] then return 1 diff --git a/eclass/games.eclass b/eclass/games.eclass index e64eba030d25..70bcdccdb917 100644 --- a/eclass/games.eclass +++ b/eclass/games.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/games.eclass,v 1.87 2005/02/05 21:32:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.88 2005/02/18 18:04:42 azarah Exp $ # # devlist: {vapier,wolf31o2,mr_bones_}@gentoo.org -> games@gentoo.org # @@ -52,9 +52,10 @@ egamesconf() { --host=${CHOST} \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ - --datadir="${GAMES_DATADIR}" \ - --sysconfdir="${GAMES_SYSCONFDIR}" \ - --localstatedir="${GAMES_STATEDIR}" \ + --datadir=${GAMES_DATADIR} \ + --sysconfdir=${GAMES_SYSCONFDIR} \ + --localstatedir=${GAMES_STATEDIR} \ + --with-data-dir=${GAMES_DATADIR}/${PN} \ ${EXTRA_ECONF} \ "$@" || die "egamesconf failed" else diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 38541c482535..c17c97bb5be4 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.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/toolchain.eclass,v 1.110 2005/02/14 11:33:11 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.111 2005/02/18 18:04:42 azarah Exp $ HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html" LICENSE="GPL-2 LGPL-2.1" @@ -699,7 +699,7 @@ gcc-compiler_pkg_preinst() { use multislot && return 0 # libtool files aren't affected by cross compilers - is_crosscompile || return 0 + is_crosscompile && return 0 # Now check to see if we already have a version installed in this # SLOT ... if we do, then bail if it's a minor upgrade (like we |