Author: justin
Date: 2006-07-12 02:01:40 -0600 (Wed, 12 Jul 2006)
New Revision: 1603
Removed:
branches/cross/packages/zlib/vars/
Modified:
branches/cross/packages/autoconf/Makefile
branches/cross/packages/automake/Makefile
branches/cross/packages/coreutils/Makefile
branches/cross/packages/diffutils/Makefile
branches/cross/packages/zlib/Makefile
Log:
Removed more LIB_MAYBE64s, upgrade coreutils, diffutils and removed unneeded
vars dir from zlib.
Modified: branches/cross/packages/autoconf/Makefile
===================================================================
--- branches/cross/packages/autoconf/Makefile 2006-07-12 07:44:53 UTC (rev
1602)
+++ branches/cross/packages/autoconf/Makefile 2006-07-12 08:01:40 UTC (rev
1603)
@@ -21,11 +21,7 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
-ifndef CROSS
./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr
-endif
make $(PM)
make install
Modified: branches/cross/packages/automake/Makefile
===================================================================
--- branches/cross/packages/automake/Makefile 2006-07-12 07:44:53 UTC (rev
1602)
+++ branches/cross/packages/automake/Makefile 2006-07-12 08:01:40 UTC (rev
1603)
@@ -21,11 +21,7 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
-ifndef CROSS
./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr
-endif
make $(PM)
make install
Modified: branches/cross/packages/coreutils/Makefile
===================================================================
--- branches/cross/packages/coreutils/Makefile 2006-07-12 07:44:53 UTC (rev
1602)
+++ branches/cross/packages/coreutils/Makefile 2006-07-12 08:01:40 UTC (rev
1603)
@@ -1,12 +1,12 @@
# Coreutils Makefile
NM= coreutils
-VRS= 5.94
+VRS= 5.96
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= c39add02995304e1cf3dfc8543702f22155fba50
+SHA-$(FILE)= 782379daf200427058ca94a408566d600f779823
PATCH1= $(DIR)-uname-1.patch
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
@@ -16,10 +16,6 @@
URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
SHA-$(PATCH2)= a7dedf947b7651f882c8ede00eb6e56689bbb154
-PATCH50= $(DIR)-i18n-1.patch
-URL-$(PATCH50)= $(HTTP)/$(NM)/$(PATCH50)
-SHA-$(PATCH50)= 3ff73ceeae8ef66345cfed38f770e51db4d02199
-
# Targets
include $(ROOT)/scripts/functions
@@ -29,28 +25,22 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
-ifndef CROSS
- ./configure --prefix=$(WD)
-else
+ echo "ac_cv_sys_restartable_syscalls=yes" > config.cache
+ echo "ac_cv_func_setvbuf_reversed=yes" >> config.cache
echo "utils_cv_sys_open_max=1024" >> config.cache
CC="$${CC} $(64FLAGS)" \
./configure --prefix=$(WD) --cache-file=config.cache \
- --build=$(LFS_HOST) --host=$(LFS_TARGET)
-endif
+ --build=$(CLFS_HOST) --host=$(CLFS_TARGET)
make $(PM)
make install
-ifndef CROSS
- mv $(WD)/bin/uname $(WD)/bin/uname.real
- install -m 755 $(MP)$(ROOT)/uname/uname $(WD)/bin/
-endif
chroot:
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH50)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH2)
$(std_build)
- cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH50)} $(LFSSRC)/
+ cp $(SRC)/{$(PATCH1),$(PATCH2)} $(LFSSRC)/
compile-stage2:
ifeq ($(LFS-ARCH),x86)
@@ -60,25 +50,16 @@
patch -Np1 -i ../$(PATCH1)
endif
patch -Np1 -i ../$(PATCH2)
- patch -Np1 -i ../$(PATCH50)
- chmod +x tests/sort/sort-mb-tests
- sed -i 's/_LEN 6/_LEN 20/' src/who.c
-ifndef CROSS
./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr
-endif
make $(PM)
make install
- $(WD)/bin/mv /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
- $(WD)/bin/mv /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,rm} /bin
- mv /usr/bin/{rmdir,stty,sync,true,uname} /bin
- mv /usr/bin/chroot /usr/sbin
- mv /usr/bin/{head,sleep} /bin
-ifndef CROSS
- mv /bin/uname /bin/uname.real
- install -m 755 ${ROOT}/uname/uname /bin/
-endif
+ mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
+ mv -v /usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} /bin
+ mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
+ mv -v /usr/bin/chroot /usr/sbin
+ mv -v /usr/bin/{[,basename,head,install,nice} /bin
+ mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
+ ln -svf ../../bin/install /usr/bin
clean:
-rm -rf $(DIR)
Modified: branches/cross/packages/diffutils/Makefile
===================================================================
--- branches/cross/packages/diffutils/Makefile 2006-07-12 07:44:53 UTC (rev
1602)
+++ branches/cross/packages/diffutils/Makefile 2006-07-12 08:01:40 UTC (rev
1603)
@@ -1,17 +1,13 @@
# diffutils Makefile
NM= diffutils
-VRS= 2.8.1
+VRS= 2.8.7
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= a4c467c3a6a08cde9f3d94d02067ec26436e7dc5
+SHA-$(FILE)= b05cfdd651137d46d97872dd646db0dd92077f0d
-PATCH50= $(DIR)-i18n-1.patch
-URL-$(PATCH50)= $(HTTP)/$(NM)/$(PATCH50)
-SHA-$(PATCH50)= 2d88d693ab572f04990a3a28deb5e743e288b9da
-
# Targets
include $(ROOT)/scripts/functions
@@ -21,12 +17,8 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
-ifndef CROSS
- ./configure --prefix=$(WD)
-else
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
- --host=$(LFS_TARGET)
-endif
+ --build=$(CLFS_HOST) --host=$(CLFS_TARGET)
make $(PM)
make install
@@ -34,17 +26,11 @@
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH50)
+stage2: Makefile $(FILE)
$(std_build)
- cp $(SRC)/$(PATCH50) $(LFSSRC)
compile-stage2:
- patch -Np1 -i ../$(PATCH50)
-ifndef CROSS
./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr
-endif
make $(PM)
make install
Modified: branches/cross/packages/zlib/Makefile
===================================================================
--- branches/cross/packages/zlib/Makefile 2006-07-12 07:44:53 UTC (rev
1602)
+++ branches/cross/packages/zlib/Makefile 2006-07-12 08:01:40 UTC (rev
1603)
@@ -8,42 +8,30 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 60faeaaf250642db5c0ea36cd6dcc9f99c8f3902
-include $(CROSSVARS)
+PATCH1= $(DIR)-fPIC-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
+SHA-$(PATCH1)= fa13b1aa053125b18c0bcbc68a5c2f79ed291e8d
# Targets
include $(ROOT)/scripts/functions
-stage1: $(FILE)
- $(std_build)
-
-compile-stage1:
- CC="$${CC} $(64FLAGS)" CFLAGS="${CFLAGS} -fPIC" ./configure
--prefix=$(WD) \
- --shared --libdir=$(WD)/lib64
- make
- make install
-
chroot:
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
$(std_build)
- cp $(SRC)/$(FILE) $(LFSSRC)
+ cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage2:
- $(ARCH_CC) $(ARCH_CFLAGS) ./configure --prefix=/usr --shared
--libdir=/$(LIB_MAYBE64)
+ ./configure --prefix=/usr --shared
make $(PM)
make install
- rm /$(LIB_MAYBE64)/libz.so
- ln -sf ../../$(LIB_MAYBE64)/libz.so.$(VRS) /usr/$(LIB_MAYBE64)/libz.so
- make clean
- $(ARCH_CC) ./configure --prefix=/usr $(EXTRA_CONF)
- make $(PM)
- make install
- chmod 644 /usr/$(LIB_MAYBE64)/libz.a
+ mv -v /usr/lib/libz.so.* /lib
+ ln -svf ../../lib/libz.so.1 /usr/lib/libz.so
clean:
-rm -rf $(DIR)
-.PHONY: compile-stage1 clean chroot compile-stage2
+.PHONY: clean chroot compile-stage2
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
