From: Simon Stelling Date: Sun, 11 Feb 2007 15:09:15 +0000 (+0000) Subject: move the devel-profile 32bit-userland out of 2006.0 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f630e6f71debc762feb4c1220ee5962182f5d420;p=gentoo.git move the devel-profile 32bit-userland out of 2006.0 --- diff --git a/profiles/default-linux/amd64/2006.0/32bit-userland/README b/profiles/default-linux/amd64/2006.0/32bit-userland/README deleted file mode 100644 index 0e0f5473debf..000000000000 --- a/profiles/default-linux/amd64/2006.0/32bit-userland/README +++ /dev/null @@ -1,9 +0,0 @@ -Disclaimer: Don't even think about using this profile outside a chroot. -All problems related to the profile should block tracker bug #124816. - -Since getting this profile running with a stage3 is rather... "tricky", -I've put together an experimental stage: - -http://dev.gentoo.org/~blubb/32bit-userland.tar.bz2 - -Have fun! diff --git a/profiles/default-linux/amd64/2006.0/32bit-userland/make.defaults b/profiles/default-linux/amd64/2006.0/32bit-userland/make.defaults deleted file mode 100644 index 60942630d04b..000000000000 --- a/profiles/default-linux/amd64/2006.0/32bit-userland/make.defaults +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/32bit-userland/make.defaults,v 1.2 2006/03/03 12:41:13 blubb Exp $ - -FEATURES="multilib-strict" - -DEFAULT_ABI="x86" -KERNEL_ABI="amd64" -ABI=${DEFAULT_ABI} - -CFLAGS_amd64="-m64 " -LDFLAGS_amd64="-m elf_x86_64" - -CFLAGS_x86="-m32 " -LDFLAGS_x86="-m elf_i386" - -# In case someone wants to help out by setting FEATURES="multilib-strict" -MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib" -MULTILIB_STRICT_DENY="64-bit.*shared object" -MULTILIB_STRICT_EXEMPT="(perl5|gcc|gcc-lib|eclipse-3|debug|portage)" diff --git a/profiles/default-linux/amd64/2006.0/32bit-userland/parent b/profiles/default-linux/amd64/2006.0/32bit-userland/parent deleted file mode 100644 index f3229c5b9876..000000000000 --- a/profiles/default-linux/amd64/2006.0/32bit-userland/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/profiles/default-linux/amd64/2006.0/32bit-userland/profile.bashrc b/profiles/default-linux/amd64/2006.0/32bit-userland/profile.bashrc deleted file mode 100644 index 110bd5aeac1d..000000000000 --- a/profiles/default-linux/amd64/2006.0/32bit-userland/profile.bashrc +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/2006.0/32bit-userland/profile.bashrc,v 1.3 2006/03/16 20:06:17 kugelfang Exp $ - -if [ -z "${IWANTTOTRASHMYSYSTEM}" ]; then - eerror "The 2006.0/32bit-userland profile is currently broken and only" - eerror "for development purposes in the tree. An announcement will be sent" - eerror "out to gentoo-amd64@lists.gentoo.org as soon as it is save for more testing." -fi diff --git a/profiles/default-linux/amd64/ChangeLog b/profiles/default-linux/amd64/ChangeLog index fdd69dfaad39..72f26d0379d4 100644 --- a/profiles/default-linux/amd64/ChangeLog +++ b/profiles/default-linux/amd64/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for Gentoo/AMD64 profile directory # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.66 2007/02/10 21:16:32 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/ChangeLog,v 1.67 2007/02/11 15:09:14 blubb Exp $ + + 11 Feb 2007; Simon Stelling + -2006.0/32bit-userland/README, +dev/32bit-userland/make.defaults, + -2006.0/32bit-userland/make.defaults, +dev/32bit-userland/packages, + -2006.0/32bit-userland/parent, +dev/32bit-userland/parent, + -2006.0/32bit-userland/profile.bashrc, +dev/32bit-userland/README, + make.defaults: + move the devel-profile 32bit-userland out of 2006.0 10 Feb 2007; Simon Stelling package.use.mask: re-mask mmx for imlib2; bug 166240 diff --git a/profiles/default-linux/amd64/dev/32bit-userland/README b/profiles/default-linux/amd64/dev/32bit-userland/README new file mode 100644 index 000000000000..2374d03c4b1b --- /dev/null +++ b/profiles/default-linux/amd64/dev/32bit-userland/README @@ -0,0 +1,14 @@ +IMPORTANT +========= + +Here's how to use this profile. Any other use will probably break your installation, so you better follow it closely. + +1. Download the latest amd64 stage2 tarball +2. Unpack it to your chroot location and do all the bind mounts +3. Chroot in +4. run `find /usr/lib64 /lib64 -exec touch {} \;' +5. remove the "CHOST=" line from /etc/make.conf +6. change the /etc/make.profile link to this profile +7. run `emerge -e world' + +Dependencies might not always be quite correct. Don't use this profile for anything else then creating emul-libs. diff --git a/profiles/default-linux/amd64/dev/32bit-userland/make.defaults b/profiles/default-linux/amd64/dev/32bit-userland/make.defaults new file mode 100644 index 000000000000..9d86cd7ce160 --- /dev/null +++ b/profiles/default-linux/amd64/dev/32bit-userland/make.defaults @@ -0,0 +1,20 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/32bit-userland/make.defaults,v 1.1 2007/02/11 15:09:15 blubb Exp $ + +DEFAULT_ABI="x86" +ABI="x86" +CHOST="i686-pc-linux-gnu" + +# Catalyst specific settings: +# This will be commented and replaced with just STAGE1_USE="unicode" if we do +# not end up with a stable glibc 2.4 by 2006.1's release. +STAGE1_USE="nptl nptlonly unicode" + +# General 2006.1 profile settings +# These USE flags are what is common between the various sub-profiles. +USE="cups gdbm gpm libg++ nptl nptlonly ppds udev unicode" + +FEATURES="multilib-strict" +MULTILIB_STRICT_DIRS="/lib32 /lib /usr/lib32 /usr/lib /usr/kde/*/lib32 /usr/kde/*/lib /usr/qt/*/lib32 /usr/qt/*/lib /usr/X11R6/lib32 /usr/X11R6/lib" +MULTILIB_STRICT_DENY="64-bit.*shared object" diff --git a/profiles/default-linux/amd64/dev/32bit-userland/packages b/profiles/default-linux/amd64/dev/32bit-userland/packages new file mode 100644 index 000000000000..b6e1f2f8e7f3 --- /dev/null +++ b/profiles/default-linux/amd64/dev/32bit-userland/packages @@ -0,0 +1,17 @@ +# Copyright 2001-2004 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License, v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/dev/32bit-userland/packages,v 1.1 2007/02/11 15:09:15 blubb Exp $ + +# For instructions on how this file works (as an inclusion mask, primarily), +# please refer to ${PORTDIR}/profiles/base/packages + +# Use this file to lock down specific versions of packages ONLY TO THIS +# SPECIFIC PROFILE! + +# You can also add files to the base system itself if you prefix them with a +# * + +>=sys-apps/baselayout-1.11.12-r4 +>=sys-devel/binutils-2.15.90.0.3-r4 +>=sys-devel/gcc-3.3.4-r1 +>=sys-libs/glibc-2.3.3.20040420-r1 diff --git a/profiles/default-linux/amd64/dev/32bit-userland/parent b/profiles/default-linux/amd64/dev/32bit-userland/parent new file mode 100644 index 000000000000..aab0408ceca6 --- /dev/null +++ b/profiles/default-linux/amd64/dev/32bit-userland/parent @@ -0,0 +1 @@ +../.. diff --git a/profiles/default-linux/amd64/make.defaults b/profiles/default-linux/amd64/make.defaults index 12e14282d788..5ac3fa830679 100644 --- a/profiles/default-linux/amd64/make.defaults +++ b/profiles/default-linux/amd64/make.defaults @@ -1,11 +1,11 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/make.defaults,v 1.21 2006/12/23 14:15:51 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/amd64/make.defaults,v 1.22 2007/02/11 15:09:15 blubb Exp $ ARCH="amd64" ACCEPT_KEYWORDS="${ARCH}" -CHOST="x86_64-pc-linux-gnu" +#CHOST="x86_64-pc-linux-gnu" CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}"