From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sun, 8 Oct 2006 18:05:04 +0000 (+0000)
Subject: Zwischencommit fuer LFS.
X-Git-Tag: v2.3-beta1~948
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=119ee46932585d3b7289a288007f0ec65ad38d8e

Zwischencommit fuer LFS.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@306 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/lfs/autoconf b/lfs/autoconf
index 9244fc05d7..9472aba4ca 100644
--- a/lfs/autoconf
+++ b/lfs/autoconf
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
diff --git a/lfs/bzip2 b/lfs/bzip2
index fb7c0b3894..6f53ed4bcd 100644
--- a/lfs/bzip2
+++ b/lfs/bzip2
@@ -47,9 +47,9 @@ endif
 
 objects = $(DL_FILE)
 
-$(DL_FILE)                        = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                    = 8a716bebecb6e647d2e8a29ea5d8447f
+$(DL_FILE)_MD5 = 8a716bebecb6e647d2e8a29ea5d8447f
 
 install : $(TARGET)
 
@@ -86,12 +86,12 @@ ifeq "$(ROOT)" ""
 	cd $(DIR_APP) && make clean
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cp -v bzip2-shared /bin/bzip2
-	cp -av libbz2.so* /lib
-	ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
+	cd $(DIR_APP) && cp -v bzip2-shared /bin/bzip2
+	cd $(DIR_APP) && cp -av libbz2.so* /lib
+	ln -sfv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
 	rm -v /usr/bin/{bunzip2,bzcat,bzip2}
-	ln -sv bzip2 /bin/bunzip2
-	ln -sv bzip2 /bin/bzcat
+	ln -sfv bzip2 /bin/bunzip2
+	ln -sfv bzip2 /bin/bzcat
 else
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make PREFIX=/tools install
diff --git a/lfs/ncurses b/lfs/ncurses
index c589c58693..1d6d0c71e4 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -98,9 +98,9 @@ ifeq "$(ROOT)" ""
 	mv -v /usr/lib/libncursesw.so.5* /lib
 	ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
 	cd $(DIR_APP) && for lib in curses ncurses form panel menu ; do \
-	    rm -vf /usr/lib/lib${lib}.so ; \
-	    echo "INPUT(-l${lib}w)" >/usr/lib/lib${lib}.so ; \
-	    ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \
+	    rm -vf /usr/lib/lib$${lib}.so ; \
+	    echo "INPUT(-l$${lib}w)" >/usr/lib/lib$${lib}.so ; \
+	    ln -sfv lib$${lib}w.a /usr/lib/lib$${lib}.a ; \
 	done
 	ln -sfv libncurses++w.a /usr/lib/libncurses++.a4
 	echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so
diff --git a/lfs/perl b/lfs/perl
index 38ef2a3260..2e4ba2d012 100644
--- a/lfs/perl
+++ b/lfs/perl
@@ -85,6 +85,8 @@ endif
 ifeq "$(ROOT)" ""
 	cd $(DIR_APP) && ./configure.gnu --prefix=/usr -Dman1dir=/usr/share/man/man1 \
 		-Dman3dir=/usr/share/man/man3 -Dpager="/usr/bin/less -isR"
+	cd $(DIR_APP) && sed -i 's/^0$$//' makefile
+	cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 else
diff --git a/make.sh b/make.sh
index 1d8ad9824a..d920f172bf 100644
--- a/make.sh
+++ b/make.sh
@@ -191,6 +191,9 @@ prepareenv() {
     mount --bind $BASEDIR/log    $BASEDIR/build/usr/src/log
     mount --bind $BASEDIR/src    $BASEDIR/build/usr/src/src
 
+    # This is a temporary hack!!!
+    cp -f /bin/hostname /tools/bin/hostname 2>/dev/null
+
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_HASHDIR=1