| 1 |
solar 09/02/26 23:37:46 |
| 2 |
|
| 3 |
Modified: cross-fix-root emerge-wrapper |
| 4 |
Log: |
| 5 |
- some updates |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.2 crossdev-wrappers/cross-fix-root |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/cross-fix-root?rev=1.2&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/cross-fix-root?rev=1.2&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/cross-fix-root?r1=1.1&r2=1.2 |
| 13 |
|
| 14 |
Index: cross-fix-root |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-projects/crossdev-wrappers/cross-fix-root,v |
| 17 |
retrieving revision 1.1 |
| 18 |
retrieving revision 1.2 |
| 19 |
diff -u -r1.1 -r1.2 |
| 20 |
--- cross-fix-root 26 Feb 2009 23:19:51 -0000 1.1 |
| 21 |
+++ cross-fix-root 26 Feb 2009 23:37:46 -0000 1.2 |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
#!/bin/bash |
| 24 |
# Copyright 2008-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-projects/crossdev-wrappers/cross-fix-root,v 1.1 2009/02/26 23:19:51 solar Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-projects/crossdev-wrappers/cross-fix-root,v 1.2 2009/02/26 23:37:46 solar Exp $ |
| 28 |
|
| 29 |
# - solar |
| 30 |
|
| 31 |
@@ -45,4 +45,4 @@ |
| 32 |
fix_pc_files ${CROSS_ROOT} |
| 33 |
pc_count=$? |
| 34 |
: |
| 35 |
-( . /sbin/functions.sh ; einfo "Scanned/Fixed $pc_count "'*'".pc and $la_count "'*'".la files" ) |
| 36 |
+( . /etc/init.d/functions.sh; einfo "Scanned/Fixed $pc_count "'*'".pc and $la_count "'*'".la files" ) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.2 crossdev-wrappers/emerge-wrapper |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/emerge-wrapper?rev=1.2&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/emerge-wrapper?rev=1.2&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/crossdev-wrappers/emerge-wrapper?r1=1.1&r2=1.2 |
| 45 |
|
| 46 |
Index: emerge-wrapper |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-projects/crossdev-wrappers/emerge-wrapper,v |
| 49 |
retrieving revision 1.1 |
| 50 |
retrieving revision 1.2 |
| 51 |
diff -u -r1.1 -r1.2 |
| 52 |
--- emerge-wrapper 26 Feb 2009 23:19:51 -0000 1.1 |
| 53 |
+++ emerge-wrapper 26 Feb 2009 23:37:46 -0000 1.2 |
| 54 |
@@ -1,26 +1,38 @@ |
| 55 |
#!/bin/bash |
| 56 |
# Copyright 2008-2009 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-projects/crossdev-wrappers/emerge-wrapper,v 1.1 2009/02/26 23:19:51 solar Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-projects/crossdev-wrappers/emerge-wrapper,v 1.2 2009/02/26 23:37:46 solar Exp $ |
| 60 |
|
| 61 |
# - solar |
| 62 |
|
| 63 |
cross_wrap_etc() { |
| 64 |
local chost=$1 |
| 65 |
cp -a __PREFIX__/share/crossdev/etc /usr/$chost/ |
| 66 |
- |
| 67 |
+ (cd /usr/$chost/etc ; ln -s /etc/make.globals make.globals ) |
| 68 |
conf=/usr/$chost/etc/make.conf |
| 69 |
|
| 70 |
if [[ ${chost:0:1} == "i" ]] && [[ ${chost:3:4} == "86" ]]; then |
| 71 |
+ E_MACHINE=EM_X86 |
| 72 |
ARCH=x86 |
| 73 |
fi |
| 74 |
|
| 75 |
+ if [[ ${chost:3:4} == "x86_64" ]]; then |
| 76 |
+ E_MACHINE=EM_X86_64 |
| 77 |
+ ARCH=amd64 |
| 78 |
+ fi |
| 79 |
+ |
| 80 |
if [[ ${chost:0:3} == "arm" ]]; then |
| 81 |
E_MACHINE=EM_ARM |
| 82 |
ARCH=arm |
| 83 |
echo 'UCLIBC_CPU_DEFAULT="GENERIC_ARM"' >> ${conf} |
| 84 |
fi |
| 85 |
|
| 86 |
+ if [[ ${chost:0:4} == "mips" ]]; then |
| 87 |
+ E_MACHINE=EM_MIPS |
| 88 |
+ ARCH=mips |
| 89 |
+ fi |
| 90 |
+ [[ ${chost/gnu/} != $chost ]] && sed -i -e s/__LIBC__/glibc/g ${conf} |
| 91 |
+ [[ ${chost/uclibc/} != $chost ]] && sed -i -e s/__LIBC__/glibc/g ${conf} |
| 92 |
[[ $E_MACHINE != "" ]] && sed -i -e s/'#E_MACHINE=__E_MACHINE__'/E_MACHINE=${E_MACHINE}/g ${conf} |
| 93 |
[[ $ARCH != "" ]] && sed -i -e s/__ARCH__/${ARCH}/g ${conf} |
| 94 |
sed -i -e s/__CHOST__/${chost}/g -e s/__CBUILD__/${CBUILD}/g ${conf} |
Archives