| 1 |
commit: 6b687cffa3c18b47ed200953ce7a2f24acd397cb |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 5 19:46:53 2012 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 5 19:46:53 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=6b687cff |
| 7 |
|
| 8 |
sys-libs/uclibc: split config for i386 and amd64 |
| 9 |
|
| 10 |
(Portage version: 2.1.10.41/git/Linux x86_64, signed Manifest commit with key 0xD0455535) |
| 11 |
|
| 12 |
--- |
| 13 |
.../files/{uclibc.config => uclibc-amd64.config} | 13 ++++++------- |
| 14 |
.../files/{uclibc.config => uclibc-i386.conf} | 0 |
| 15 |
sys-libs/uclibc/uclibc-0.9.32.1.ebuild | 11 ++++++++++- |
| 16 |
3 files changed, 16 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-libs/uclibc/files/uclibc.config b/sys-libs/uclibc/files/uclibc-amd64.config |
| 19 |
similarity index 97% |
| 20 |
copy from sys-libs/uclibc/files/uclibc.config |
| 21 |
copy to sys-libs/uclibc/files/uclibc-amd64.config |
| 22 |
index 421c8ed..c82895c 100644 |
| 23 |
--- a/sys-libs/uclibc/files/uclibc.config |
| 24 |
+++ b/sys-libs/uclibc/files/uclibc-amd64.config |
| 25 |
@@ -1,7 +1,7 @@ |
| 26 |
# |
| 27 |
# Automatically generated make config: don't edit |
| 28 |
# Version: 0.9.32.1 |
| 29 |
-# Mon Jan 2 09:33:28 2012 |
| 30 |
+# Thu Jan 5 19:43:19 2012 |
| 31 |
# |
| 32 |
# TARGET_alpha is not set |
| 33 |
# TARGET_arm is not set |
| 34 |
@@ -12,7 +12,7 @@ |
| 35 |
# TARGET_frv is not set |
| 36 |
# TARGET_h8300 is not set |
| 37 |
# TARGET_hppa is not set |
| 38 |
-TARGET_i386=y |
| 39 |
+# TARGET_i386 is not set |
| 40 |
# TARGET_i960 is not set |
| 41 |
# TARGET_ia64 is not set |
| 42 |
# TARGET_m68k is not set |
| 43 |
@@ -26,21 +26,21 @@ TARGET_i386=y |
| 44 |
# TARGET_sparc is not set |
| 45 |
# TARGET_v850 is not set |
| 46 |
# TARGET_vax is not set |
| 47 |
-# TARGET_x86_64 is not set |
| 48 |
+TARGET_x86_64=y |
| 49 |
# TARGET_xtensa is not set |
| 50 |
# TARGET_c6x is not set |
| 51 |
|
| 52 |
# |
| 53 |
# Target Architecture Features and Options |
| 54 |
# |
| 55 |
-TARGET_ARCH="i386" |
| 56 |
+TARGET_ARCH="x86_64" |
| 57 |
FORCE_OPTIONS_FOR_ARCH=y |
| 58 |
# CONFIG_GENERIC_386 is not set |
| 59 |
# CONFIG_386 is not set |
| 60 |
# CONFIG_486 is not set |
| 61 |
# CONFIG_586 is not set |
| 62 |
# CONFIG_586MMX is not set |
| 63 |
-CONFIG_686=y |
| 64 |
+# CONFIG_686 is not set |
| 65 |
# CONFIG_PENTIUMII is not set |
| 66 |
# CONFIG_PENTIUMIII is not set |
| 67 |
# CONFIG_PENTIUM4 is not set |
| 68 |
@@ -52,7 +52,7 @@ CONFIG_686=y |
| 69 |
# CONFIG_WINCHIP2 is not set |
| 70 |
# CONFIG_CYRIXIII is not set |
| 71 |
# CONFIG_NEHEMIAH is not set |
| 72 |
-TARGET_SUBARCH="i686" |
| 73 |
+TARGET_SUBARCH="" |
| 74 |
|
| 75 |
# |
| 76 |
# Using ELF file format |
| 77 |
@@ -235,7 +235,6 @@ HARDWIRED_ABSPATH=y |
| 78 |
# |
| 79 |
# Security options |
| 80 |
# |
| 81 |
-UCLIBC_BUILD_PIE=y |
| 82 |
UCLIBC_HAS_ARC4RANDOM=y |
| 83 |
# HAVE_NO_SSP is not set |
| 84 |
UCLIBC_HAS_SSP=y |
| 85 |
|
| 86 |
diff --git a/sys-libs/uclibc/files/uclibc.config b/sys-libs/uclibc/files/uclibc-i386.conf |
| 87 |
similarity index 100% |
| 88 |
rename from sys-libs/uclibc/files/uclibc.config |
| 89 |
rename to sys-libs/uclibc/files/uclibc-i386.conf |
| 90 |
|
| 91 |
diff --git a/sys-libs/uclibc/uclibc-0.9.32.1.ebuild b/sys-libs/uclibc/uclibc-0.9.32.1.ebuild |
| 92 |
index dd60f75..369de43 100644 |
| 93 |
--- a/sys-libs/uclibc/uclibc-0.9.32.1.ebuild |
| 94 |
+++ b/sys-libs/uclibc/uclibc-0.9.32.1.ebuild |
| 95 |
@@ -27,7 +27,16 @@ src_prepare() { |
| 96 |
} |
| 97 |
|
| 98 |
src_configure() { |
| 99 |
- cp "${FILESDIR}"/uclibc.config .config |
| 100 |
+ case ${ARCH} in |
| 101 |
+ x86) |
| 102 |
+ cp "${FILESDIR}"/uclibc-i386.config .config || die "could not copy config file" |
| 103 |
+ ;; |
| 104 |
+ amd64) |
| 105 |
+ cp "${FILESDIR}"/uclibc-amd64.config .config || die "could not copy config file" |
| 106 |
+ ;; |
| 107 |
+ *) |
| 108 |
+ eerror "${ARCH} is not supported" |
| 109 |
+ esac |
| 110 |
yes "" 2> /dev/null | make -s oldconfig > /dev/null || die "could not make oldconfig" |
| 111 |
} |
Archives