1 |
alonbl 07/11/30 21:49:34 |
2 |
|
3 |
Modified: ChangeLog busybox-1.8.2.ebuild |
4 |
Log: |
5 |
Fix cross compile, bug#200367, thanks to Joakim Tjernlund |
6 |
(Portage version: 2.1.4_rc4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.165 sys-apps/busybox/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.165&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?rev=1.165&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/ChangeLog?r1=1.164&r2=1.165 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v |
18 |
retrieving revision 1.164 |
19 |
retrieving revision 1.165 |
20 |
diff -u -r1.164 -r1.165 |
21 |
--- ChangeLog 28 Nov 2007 21:34:01 -0000 1.164 |
22 |
+++ ChangeLog 30 Nov 2007 21:49:34 -0000 1.165 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for sys-apps/busybox |
25 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.164 2007/11/28 21:34:01 alonbl Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.165 2007/11/30 21:49:34 alonbl Exp $ |
28 |
+ |
29 |
+ 30 Nov 2007; Alon Bar-Lev <alonbl@g.o> busybox-1.8.2.ebuild: |
30 |
+ Fix cross compile, bug#200367, thanks to Joakim Tjernlund |
31 |
|
32 |
*busybox-1.8.2 (28 Nov 2007) |
33 |
|
34 |
|
35 |
|
36 |
|
37 |
1.2 sys-apps/busybox/busybox-1.8.2.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?rev=1.2&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?rev=1.2&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild?r1=1.1&r2=1.2 |
42 |
|
43 |
Index: busybox-1.8.2.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v |
46 |
retrieving revision 1.1 |
47 |
retrieving revision 1.2 |
48 |
diff -u -r1.1 -r1.2 |
49 |
--- busybox-1.8.2.ebuild 28 Nov 2007 21:34:01 -0000 1.1 |
50 |
+++ busybox-1.8.2.ebuild 30 Nov 2007 21:49:34 -0000 1.2 |
51 |
@@ -1,8 +1,8 @@ |
52 |
# Copyright 1999-2007 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.1 2007/11/28 21:34:01 alonbl Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.8.2.ebuild,v 1.2 2007/11/30 21:49:34 alonbl Exp $ |
56 |
|
57 |
-inherit eutils flag-o-matic savedconfig |
58 |
+inherit eutils flag-o-matic savedconfig toolchain-funcs |
59 |
|
60 |
################################################################################ |
61 |
# BUSYBOX ALTERNATE CONFIG MINI-HOWTO |
62 |
@@ -88,6 +88,9 @@ |
63 |
# patches go here! |
64 |
epatch "${FILESDIR}"/busybox-1.7.0-bb.patch |
65 |
|
66 |
+ # set build environment |
67 |
+ MAKE_CONFIG="CROSS_COMPILE=${CHOST}- ARCH=$(tc-arch-kernel) HOSTCC=${CBUILD}-gcc" |
68 |
+ |
69 |
# work around broken ass powerpc compilers |
70 |
use ppc64 && append-flags -mminimal-toc |
71 |
if ! use uclibc; then |
72 |
@@ -95,10 +98,8 @@ |
73 |
sed -i 's:-Wl,--gc-sections::' scripts/trylink |
74 |
sed -i '/^#error Aborting compilation./d' applets/applets.c |
75 |
fi |
76 |
- echo "CROSS_COMPILE := ${CHOST}-" >> Makefile.local |
77 |
|
78 |
# check for a busybox config before making one of our own. |
79 |
- # if one exist lets return and use it. |
80 |
|
81 |
restore_config .config |
82 |
if [ -f .config ]; then |
83 |
@@ -151,10 +152,10 @@ |
84 |
src_compile() { |
85 |
unset KBUILD_OUTPUT #88088 |
86 |
|
87 |
- emake busybox || die "build failed" |
88 |
+ emake busybox ${MAKE_CONFIG} || die "build failed" |
89 |
if ! use static && ! use pam ; then |
90 |
mv busybox_unstripped{,.bak} |
91 |
- emake CONFIG_STATIC=y busybox || die "static build failed" |
92 |
+ emake busybox CONFIG_STATIC=y ${MAKE_CONFIG} || die "static build failed" |
93 |
mv busybox_unstripped bb |
94 |
mv busybox_unstripped{.bak,} |
95 |
fi |
96 |
@@ -177,7 +178,7 @@ |
97 |
doins "${FILESDIR}"/mdev-start.sh || die |
98 |
|
99 |
# bundle up the symlink files for use later |
100 |
- emake install || die |
101 |
+ emake install ${MAKE_CONFIG} || die |
102 |
rm _install/bin/busybox |
103 |
tar cf busybox-links.tar -C _install . || : #;die |
104 |
insinto /usr/share/${PN} |
105 |
|
106 |
|
107 |
|
108 |
-- |
109 |
gentoo-commits@g.o mailing list |