summaryrefslogtreecommitdiffstats
path: root/stage1
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2011-06-15 19:23:55 -0400
committerDJ Delorie <dj@delorie.com>2011-06-15 19:23:55 -0400
commite7bc660c96fbe2594df7f6577837d4bca6b4bf73 (patch)
treef6faf32ac542fd038775ef6e8882edddf447ffca /stage1
parentc78a84d928c4218ee5a926d88403576ae1b44f24 (diff)
downloadbootstrap.git.DONOTUSE-e7bc660c96fbe2594df7f6577837d4bca6b4bf73.tar.gz
bootstrap.git.DONOTUSE-e7bc660c96fbe2594df7f6577837d4bca6b4bf73.tar.xz
bootstrap.git.DONOTUSE-e7bc660c96fbe2594df7f6577837d4bca6b4bf73.zip
Tweaks to libselinux and sed. Update README package list.
Sed - touch docs so make won't try to run the cross-sed. libselinux - force TLSFLAGS to avoid a bogus check on 32-bit hosts.
Diffstat (limited to 'stage1')
-rwxr-xr-xstage119
1 files changed, 18 insertions, 1 deletions
diff --git a/stage1 b/stage1
index 71d66bf..fe4b222 100755
--- a/stage1
+++ b/stage1
@@ -537,6 +537,8 @@ case "$1" in
fix_la cloog
;;
+ # TLSFLAGS are set in order to avoid a bogus check in
+ # libselinux/src/Makefile.
libselinux )
srpm libselinux
mcd $BUILDDIR/t-libselinux
@@ -548,6 +550,7 @@ case "$1" in
STRIP=${TARGET}-strip \
RANLIB=${TARGET}-ranlib \
CFLAGS="" \
+ TLSFLAGS="" \
all
make $J \
DESTDIR=${ROOTFS} \
@@ -594,7 +597,7 @@ EOF
make install DESTDIR=${ROOTFS}
;;
- make | sed | tar | gzip | diffutils | findutils | gawk | which | grep )
+ make | tar | gzip | diffutils | findutils | gawk | which | grep )
srpm $1
mcd $BUILDDIR/$1
$SRC/${1}-*/configure $TCONFIGARGS
@@ -604,6 +607,20 @@ EOF
make $J install DESTDIR=${ROOTFS}
;;
+ sed )
+ srpm $1
+ mcd $BUILDDIR/$1
+ $SRC/${1}-*/configure $TCONFIGARGS
+ notparallel
+ # Touch sed.1 so that it will not be built.
+ # The makefile in the sed/doc directory attempts to run the
+ # built sed binary in order to extract the --help output, but
+ # this fails because the sed binary is a cross-tool.
+ touch doc/sed.1
+ make $J V=1
+ make $J install DESTDIR=${ROOTFS}
+ ;;
+
patch )
srpm patch
mcd $BUILDDIR/$1