From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RitHN-00055j-3S for garchives@archives.gentoo.org; Thu, 05 Jan 2012 19:47:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B42A21C16B; Thu, 5 Jan 2012 19:47:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4B84821C16B for ; Thu, 5 Jan 2012 19:47:00 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 843C31B4086 for ; Thu, 5 Jan 2012 19:46:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A1C0380042 for ; Thu, 5 Jan 2012 19:46:58 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <6b687cffa3c18b47ed200953ce7a2f24acd397cb.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: sys-libs/uclibc/, sys-libs/uclibc/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: sys-libs/uclibc/files/uclibc-amd64.config sys-libs/uclibc/files/uclibc-i386.conf sys-libs/uclibc/files/uclibc.config sys-libs/uclibc/uclibc-0.9.32.1.ebuild X-VCS-Directories: sys-libs/uclibc/ sys-libs/uclibc/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 6b687cffa3c18b47ed200953ce7a2f24acd397cb Date: Thu, 5 Jan 2012 19:46:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3e63c69a-bc23-48a9-81f2-34d5e654c1e4 X-Archives-Hash: 928b943b169de7acc4e328d6392eeff1 commit: 6b687cffa3c18b47ed200953ce7a2f24acd397cb Author: Anthony G. Basile gentoo org> AuthorDate: Thu Jan 5 19:46:53 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Thu Jan 5 19:46:53 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.= git;a=3Dcommit;h=3D6b687cff sys-libs/uclibc: split config for i386 and amd64 (Portage version: 2.1.10.41/git/Linux x86_64, signed Manifest commit with= key 0xD0455535) --- .../files/{uclibc.config =3D> uclibc-amd64.config} | 13 ++++++------= - .../files/{uclibc.config =3D> uclibc-i386.conf} | 0 sys-libs/uclibc/uclibc-0.9.32.1.ebuild | 11 ++++++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/sys-libs/uclibc/files/uclibc.config b/sys-libs/uclibc/files/= uclibc-amd64.config similarity index 97% copy from sys-libs/uclibc/files/uclibc.config copy to sys-libs/uclibc/files/uclibc-amd64.config index 421c8ed..c82895c 100644 --- a/sys-libs/uclibc/files/uclibc.config +++ b/sys-libs/uclibc/files/uclibc-amd64.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Version: 0.9.32.1 -# Mon Jan 2 09:33:28 2012 +# Thu Jan 5 19:43:19 2012 # # TARGET_alpha is not set # TARGET_arm is not set @@ -12,7 +12,7 @@ # TARGET_frv is not set # TARGET_h8300 is not set # TARGET_hppa is not set -TARGET_i386=3Dy +# TARGET_i386 is not set # TARGET_i960 is not set # TARGET_ia64 is not set # TARGET_m68k is not set @@ -26,21 +26,21 @@ TARGET_i386=3Dy # TARGET_sparc is not set # TARGET_v850 is not set # TARGET_vax is not set -# TARGET_x86_64 is not set +TARGET_x86_64=3Dy # TARGET_xtensa is not set # TARGET_c6x is not set =20 # # Target Architecture Features and Options # -TARGET_ARCH=3D"i386" +TARGET_ARCH=3D"x86_64" FORCE_OPTIONS_FOR_ARCH=3Dy # CONFIG_GENERIC_386 is not set # CONFIG_386 is not set # CONFIG_486 is not set # CONFIG_586 is not set # CONFIG_586MMX is not set -CONFIG_686=3Dy +# CONFIG_686 is not set # CONFIG_PENTIUMII is not set # CONFIG_PENTIUMIII is not set # CONFIG_PENTIUM4 is not set @@ -52,7 +52,7 @@ CONFIG_686=3Dy # CONFIG_WINCHIP2 is not set # CONFIG_CYRIXIII is not set # CONFIG_NEHEMIAH is not set -TARGET_SUBARCH=3D"i686" +TARGET_SUBARCH=3D"" =20 # # Using ELF file format @@ -235,7 +235,6 @@ HARDWIRED_ABSPATH=3Dy # # Security options # -UCLIBC_BUILD_PIE=3Dy UCLIBC_HAS_ARC4RANDOM=3Dy # HAVE_NO_SSP is not set UCLIBC_HAS_SSP=3Dy diff --git a/sys-libs/uclibc/files/uclibc.config b/sys-libs/uclibc/files/= uclibc-i386.conf similarity index 100% rename from sys-libs/uclibc/files/uclibc.config rename to sys-libs/uclibc/files/uclibc-i386.conf diff --git a/sys-libs/uclibc/uclibc-0.9.32.1.ebuild b/sys-libs/uclibc/ucl= ibc-0.9.32.1.ebuild index dd60f75..369de43 100644 --- a/sys-libs/uclibc/uclibc-0.9.32.1.ebuild +++ b/sys-libs/uclibc/uclibc-0.9.32.1.ebuild @@ -27,7 +27,16 @@ src_prepare() { } =20 src_configure() { - cp "${FILESDIR}"/uclibc.config .config + case ${ARCH} in + x86) + cp "${FILESDIR}"/uclibc-i386.config .config || die "could not copy co= nfig file" + ;; + amd64) + cp "${FILESDIR}"/uclibc-amd64.config .config || die "could not copy c= onfig file" + ;; + *) + eerror "${ARCH} is not supported" + esac yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not m= ake oldconfig" } =20