| 1 |
vapier 13/05/19 05:36:28 |
| 2 |
|
| 3 |
Modified: uclibc-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Drop cpu selection for most targets since it is either pointless (does nothing) or just changes optimization flags. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.6 sys-libs/uclibc/uclibc-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild?rev=1.6&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild?rev=1.6&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild?r1=1.5&r2=1.6 |
| 15 |
|
| 16 |
Index: uclibc-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild,v |
| 19 |
retrieving revision 1.5 |
| 20 |
retrieving revision 1.6 |
| 21 |
diff -u -r1.5 -r1.6 |
| 22 |
--- uclibc-9999.ebuild 7 May 2013 16:50:58 -0000 1.5 |
| 23 |
+++ uclibc-9999.ebuild 19 May 2013 05:36:27 -0000 1.6 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild,v 1.5 2013/05/07 16:50:58 blueness Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild,v 1.6 2013/05/19 05:36:27 vapier Exp $ |
| 29 |
|
| 30 |
inherit eutils flag-o-matic multilib toolchain-funcs savedconfig |
| 31 |
if [[ ${PV} == "9999" ]] ; then |
| 32 |
@@ -62,7 +62,7 @@ |
| 33 |
} |
| 34 |
|
| 35 |
pkg_setup() { |
| 36 |
- if [ ${CTARGET} == ${CHOST} ] ; then |
| 37 |
+ if [ ${CTARGET} = ${CHOST} ] ; then |
| 38 |
case ${CHOST} in |
| 39 |
*-uclinux*|*-uclibc*) ;; |
| 40 |
*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;; |
| 41 |
@@ -70,47 +70,14 @@ |
| 42 |
fi |
| 43 |
} |
| 44 |
|
| 45 |
-# XXX: We should kill these off. |
| 46 |
-CPU_ALPHA="" |
| 47 |
-CPU_AMD64="" |
| 48 |
-CPU_ARM="GENERIC_ARM ARM{610,710,7TDMI,720T,920T,922T,926T,10T,1136JF_S,1176JZ{_,F_}S,_{SA110,SA1100,XSCALE,IWMMXT},_CORTEX_{M3,M1}}" |
| 49 |
-CPU_IA64="" |
| 50 |
-CPU_M68K="" |
| 51 |
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32{,R2},64}} MIPS_{N64,O32,N32}_ABI" |
| 52 |
-CPU_PPC="" |
| 53 |
-CPU_SH="SH{2,2A,3,4,5}" |
| 54 |
-CPU_SPARC="SPARC_V{7,8,9,9B}" |
| 55 |
-CPU_X86="GENERIC_386 {3,4,5,6}86 586MMX PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH" |
| 56 |
-IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPARC} ${CPU_X86}" |
| 57 |
- |
| 58 |
check_cpu_opts() { |
| 59 |
- local cpu_var="CPU_$(echo $(tc-arch) | tr [a-z] [A-Z])" |
| 60 |
- [[ -z ${!cpu_var} ]] && return 0 |
| 61 |
- |
| 62 |
- if [[ -z ${UCLIBC_CPU} ]] ; then |
| 63 |
- ewarn "You really should consider setting UCLIBC_CPU" |
| 64 |
- ewarn "Otherwise, the build will be generic (read: slow)." |
| 65 |
- ewarn "Available CPU options:" |
| 66 |
- UCLIBC_CPU=$(eval echo ${!cpu_var}) |
| 67 |
- echo ${UCLIBC_CPU} |
| 68 |
- case ${CTARGET} in |
| 69 |
- mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";; |
| 70 |
- sh[2345]*) export UCLIBC_CPU="SH${CTARGET:2:1}";; |
| 71 |
- i[456]86*) export UCLIBC_CPU="${CTARGET:1:1}86";; |
| 72 |
- *) export UCLIBC_CPU=${UCLIBC_CPU%% *};; |
| 73 |
- esac |
| 74 |
- else |
| 75 |
- local cpu found=0 |
| 76 |
- for cpu in $(eval echo ${!cpu_var}) ; do |
| 77 |
- [[ ${UCLIBC_CPU} == "${cpu}" ]] && found=1 && break |
| 78 |
- done |
| 79 |
- if [[ ${found} -eq 0 ]] ; then |
| 80 |
- ewarn "UCLIBC_CPU choice '${UCLIBC_CPU}' not supported" |
| 81 |
- ewarn "Valid choices:" |
| 82 |
- eval echo ${!cpu_var} |
| 83 |
- die "pick a supported cpu type" |
| 84 |
- fi |
| 85 |
- fi |
| 86 |
+ case ${CTARGET} in |
| 87 |
+ # Need to handle $ABI here w/mips. |
| 88 |
+ mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";; |
| 89 |
+ sh[2345]*) export UCLIBC_CPU="SH${CTARGET:2:1}";; |
| 90 |
+ i[3456]86*) export UCLIBC_CPU="${CTARGET:1:1}86";; |
| 91 |
+ # XXX: Should figure out how to handle sparc. |
| 92 |
+ esac |
| 93 |
} |
| 94 |
|
| 95 |
kconfig_q_opt() { |
| 96 |
@@ -277,24 +244,20 @@ |
| 97 |
|
| 98 |
########## CPU SELECTION ########## |
| 99 |
|
| 100 |
- local target config_target |
| 101 |
- case $(tc-arch) in |
| 102 |
- alpha) target="alpha"; config_target="no cpu-specific options";; |
| 103 |
- amd64) target="x86_64"; config_target="no cpu-specific options";; |
| 104 |
- arm) target="arm"; config_target="GENERIC_ARM";; |
| 105 |
- avr) target="avr32"; config_target="no cpu-specific options";; |
| 106 |
- bfin) target="bfin"; config_target="no cpu-specific options";; |
| 107 |
- ia64) target="ia64"; config_target="no cpu-specific options";; |
| 108 |
- m68k) target="m68k"; config_target="no cpu-specific options";; |
| 109 |
- mips) target="mips"; config_target="MIPS_ISA_1";; |
| 110 |
- ppc) target="powerpc"; config_target="no cpu-specific options";; |
| 111 |
- sh) target="sh"; config_target="SH4";; |
| 112 |
- sparc) target="sparc"; config_target="no cpu-specific options";; |
| 113 |
- x86) target="i386"; config_target="GENERIC_386";; |
| 114 |
- *) die "$(tc-arch) lists no defaults :/";; |
| 115 |
+ local target=$(tc-arch) config_target |
| 116 |
+ case ${target} in |
| 117 |
+ amd64) target="x86_64";; |
| 118 |
+ arm) target="arm"; config_target="GENERIC_ARM";; |
| 119 |
+ avr) target="avr32";; |
| 120 |
+ mips) target="mips"; config_target="MIPS_ISA_1";; |
| 121 |
+ ppc) target="powerpc";; |
| 122 |
+ sh) target="sh"; config_target="SH4";; |
| 123 |
+ x86) target="i386"; config_target="486";; |
| 124 |
esac |
| 125 |
- sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \ |
| 126 |
- extra/Configs/Config.${target} |
| 127 |
+ if [[ -n ${config_target} ]] ; then |
| 128 |
+ sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \ |
| 129 |
+ extra/Configs/Config.${target} || die |
| 130 |
+ fi |
| 131 |
sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak |
| 132 |
|
| 133 |
src_config |
| 134 |
|
| 135 |
|
| 136 |
|
| 137 |
1.76 sys-libs/uclibc/ChangeLog |
| 138 |
|
| 139 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/uclibc/ChangeLog?rev=1.76&view=markup |
| 140 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/uclibc/ChangeLog?rev=1.76&content-type=text/plain |
| 141 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/uclibc/ChangeLog?r1=1.75&r2=1.76 |
| 142 |
|
| 143 |
Index: ChangeLog |
| 144 |
=================================================================== |
| 145 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v |
| 146 |
retrieving revision 1.75 |
| 147 |
retrieving revision 1.76 |
| 148 |
diff -u -r1.75 -r1.76 |
| 149 |
--- ChangeLog 7 May 2013 16:50:58 -0000 1.75 |
| 150 |
+++ ChangeLog 19 May 2013 05:36:27 -0000 1.76 |
| 151 |
@@ -1,6 +1,10 @@ |
| 152 |
# ChangeLog for sys-libs/uclibc |
| 153 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 154 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.75 2013/05/07 16:50:58 blueness Exp $ |
| 155 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.76 2013/05/19 05:36:27 vapier Exp $ |
| 156 |
+ |
| 157 |
+ 19 May 2013; Mike Frysinger <vapier@g.o> uclibc-9999.ebuild: |
| 158 |
+ Drop cpu selection for most targets since it is either pointless (does |
| 159 |
+ nothing) or just changes optimization flags. |
| 160 |
|
| 161 |
07 May 2013; Anthony G. Basile <blueness@g.o> |
| 162 |
uclibc-0.9.33.2-r3.ebuild, uclibc-9999.ebuild: |
Archives