diff options
| author |   Friedrich Oslage <bluebird@gentoo.org> | 2008-12-27 10:58:46 +0000 |
|---|---|---|
| committer | Friedrich Oslage <bluebird@gentoo.org> | 2008-12-27 10:58:46 +0000 |
| commit | 6ec35302411828dbdbac44d2fef534e974c1034a (patch) | |
| tree | c3e475eb4eef508c21939b0d359553bedad4c89a /profiles | |
| parent | dont force -j1 in src_test (diff) | |
| download | gentoo-2-6ec35302411828dbdbac44d2fef534e974c1034a.tar.gz gentoo-2-6ec35302411828dbdbac44d2fef534e974c1034a.tar.bz2 gentoo-2-6ec35302411828dbdbac44d2fef534e974c1034a.zip | |
Fix multilib profile so it doesn't break linux-headers
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/arch/sparc/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/arch/sparc/make.defaults | 5 | ||||
| -rw-r--r-- | profiles/default/linux/sparc/experimental/multilib/make.defaults | 9 |
3 files changed, 15 insertions, 4 deletions
diff --git a/profiles/arch/sparc/ChangeLog b/profiles/arch/sparc/ChangeLog index 49247cc6ef09..6b78615473e8 100644 --- a/profiles/arch/sparc/ChangeLog +++ b/profiles/arch/sparc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo/sparc profile # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/ChangeLog,v 1.37 2008/12/26 11:09:43 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/ChangeLog,v 1.38 2008/12/27 10:58:46 bluebird Exp $ + + 27 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> make.defaults: + Fix multilib profile so it doesn't break linux-headers 26 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> make.defaults, packages, parent: diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults index 92430b034084..45d0b04b97fe 100644 --- a/profiles/arch/sparc/make.defaults +++ b/profiles/arch/sparc/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/make.defaults,v 1.3 2008/12/26 11:09:43 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/make.defaults,v 1.4 2008/12/27 10:58:46 bluebird Exp $ ARCH="sparc" ACCEPT_KEYWORDS="${ARCH}" @@ -26,7 +26,8 @@ LDFLAGS_sparc32="" # setting it would make gcc use -m32 and -m64 at the same tim CHOST_sparc32="sparc-unknown-linux-gnu" CTARGET_sparc32="sparc-unknown-linux-gnu" CDEFINE_sparc32="!__arch64__" -CFLAGS_sparc64="-m64" +# do NOT set CFLAGS_sparc64 here it'd break linux-headers for non-multilib +# profiles CDEFINE_sparc64="__arch64__" # Compiler flags diff --git a/profiles/default/linux/sparc/experimental/multilib/make.defaults b/profiles/default/linux/sparc/experimental/multilib/make.defaults index 1c0a78d19712..72e716ad8197 100644 --- a/profiles/default/linux/sparc/experimental/multilib/make.defaults +++ b/profiles/default/linux/sparc/experimental/multilib/make.defaults @@ -1,9 +1,16 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/experimental/multilib/make.defaults,v 1.1 2008/12/26 11:09:43 bluebird Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/sparc/experimental/multilib/make.defaults,v 1.2 2008/12/27 10:58:46 bluebird Exp $ # Multilib stuff MULTILIB_ABIS="sparc32 sparc64" # without this glibc will segfault when compiling a sparc64 abi FEATURES="userpriv" + +# can't set this in the top level make.defaults as it breaks +# sys-kernel/linux-headers for non-multilib profiles +CFLAGS_sparc64="-m64" + +# lib is a symlink to lib32 +SYMLINK_LIB="yes" |