| 1 |
On Mon, 2003-05-12 at 21:45, Matthias Liertzer wrote: |
| 2 |
> Tried to bootstrap using the new baselayout and it failed, because the new |
| 3 |
> baselayout needs gawk now. So we probably need to add the gawk package to the |
| 4 |
> bootstrap.sh script or simply to stage 1. |
| 5 |
> |
| 6 |
|
| 7 |
Right. To be honest, I have not yet tested it with a bootstrap, and |
| 8 |
this is the first that do not install the bash versions of awkified |
| 9 |
scripts anymore. |
| 10 |
|
| 11 |
This patch should fix it: |
| 12 |
|
| 13 |
----------------------------------------------------------- |
| 14 |
Index: baselayout-1.8.6.7.ebuild |
| 15 |
=================================================================== |
| 16 |
RCS file: |
| 17 |
/home/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.8.6.7.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
diff -u -r1.1 baselayout-1.8.6.7.ebuild |
| 20 |
--- baselayout-1.8.6.7.ebuild 11 May 2003 23:59:05 -0000 1.1 |
| 21 |
+++ baselayout-1.8.6.7.ebuild 12 May 2003 21:26:33 -0000 |
| 22 |
@@ -109,21 +109,24 @@ |
| 23 |
emake CC="${CC:-gcc}" LD="${CC:-gcc}" \ |
| 24 |
LDFLAGS="" || die "problem compiling sysvinit" |
| 25 |
|
| 26 |
- # We let gawk now install filefuncs.so, and that is as a symlink to a |
| 27 |
- # versioned .so ... |
| 28 |
- if [ -f /usr/include/awk/awk.h -a ! -L |
| 29 |
${ROOT}/lib/rcscripts/filefuncs.so ] |
| 30 |
+ if [ -z "`use bootstrap`" ] |
| 31 |
then |
| 32 |
- # Build gawk module |
| 33 |
-# cd ${S}/src/filefuncs |
| 34 |
-# einfo "Building awk module..." |
| 35 |
-# make CC="${CC:-gcc}" LD="${CC:-gcc}" || { |
| 36 |
-# eerror "Failed to build gawk module. Make sure you have" |
| 37 |
-# eerror "sys-apps/gawk-3.1.1-r1 or later installed" |
| 38 |
-# die "problem compiling gawk module" |
| 39 |
-# } |
| 40 |
+ # We let gawk now install filefuncs.so, and that is as a symlink to |
| 41 |
a |
| 42 |
+ # versioned .so ... |
| 43 |
+ if [ -f /usr/include/awk/awk.h -a ! -L |
| 44 |
${ROOT}/lib/rcscripts/filefuncs.so ] |
| 45 |
+ then |
| 46 |
+ # Build gawk module |
| 47 |
+# cd ${S}/src/filefuncs |
| 48 |
+# einfo "Building awk module..." |
| 49 |
+# make CC="${CC:-gcc}" LD="${CC:-gcc}" || { |
| 50 |
+# eerror "Failed to build gawk module. Make sure you have" |
| 51 |
+# eerror "sys-apps/gawk-3.1.1-r1 or later installed" |
| 52 |
+# die "problem compiling gawk module" |
| 53 |
+# } |
| 54 |
|
| 55 |
- eerror "Please install sys-apps/gawk-3.1.1-r2 or later!" |
| 56 |
- die "gawk too old" |
| 57 |
+ eerror "Please install sys-apps/gawk-3.1.1-r2 or later!" |
| 58 |
+ die "gawk too old" |
| 59 |
+ fi |
| 60 |
fi |
| 61 |
fi |
| 62 |
} |
| 63 |
@@ -300,7 +303,7 @@ |
| 64 |
# if 'build' or 'bootstrap' is not in USE. This will |
| 65 |
# change if we have sys-apps/gawk-3.1.1-r1 or later in |
| 66 |
# the build image ... |
| 67 |
- if [ -z "`use build`" -a -z "`use bootstrap`" ] |
| 68 |
+ if [ -z "`use build`" ] |
| 69 |
then |
| 70 |
# This is for new depscan and rc-envupdate.sh |
| 71 |
# written in awk |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
-- |
| 76 |
|
| 77 |
Martin Schlemmer |
| 78 |
Gentoo Linux Developer, Desktop/System Team Developer |
| 79 |
Cape Town, South Africa |
Archives