Author: justin
Date: 2006-07-12 02:21:02 -0600 (Wed, 12 Jul 2006)
New Revision: 1605
Modified:
branches/cross/Makefile
branches/cross/packages/bison/Makefile
branches/cross/packages/gawk/Makefile
branches/cross/packages/iana-etc/Makefile
branches/cross/packages/m4/Makefile
branches/cross/packages/module-init-tools/Makefile
branches/cross/packages/procps/Makefile
branches/cross/packages/sed/Makefile
branches/cross/packages/texinfo/Makefile
Log:
Bison and iana-etc upgrade, module-init-tools, m4, gawk, sed, texinfo and
procpc builds updated.
Modified: branches/cross/Makefile
===================================================================
--- branches/cross/Makefile 2006-07-12 08:09:58 UTC (rev 1604)
+++ branches/cross/Makefile 2006-07-12 08:21:02 UTC (rev 1605)
@@ -228,9 +228,9 @@
cross-tools: pre-which pre-wget clfs-linux-headers-scpt clfs-binutils-cross \
clfs-gcc-cross-static clfs-glibc-scpt clfs-gcc-cross
-tools: clfs-binutils-scpt clfs-gcc-scpt clfs-ncurses-scpt clfs-bash-scpt
stop-here \
+tools: clfs-binutils-scpt clfs-gcc-scpt clfs-ncurses-scpt clfs-bash-scpt \
clfs-bzip2-scpt clfs-coreutils-scpt clfs-diffutils-scpt
clfs-findutils-scpt \
- clfs-gawk-scpt clfs-gettext-scpt clfs-grep-scpt clfs-gzip-scpt
clfs-make-scpt \
+ clfs-gawk-scpt stop-here clfs-gettext-scpt clfs-grep-scpt
clfs-gzip-scpt clfs-make-scpt \
clfs-patch-scpt clfs-sed-scpt clfs-tar-scpt clfs-texinfo-scpt \
clfs-util-linux-scpt clfs-wget-scpt
@cp /etc/resolv.conf $(WD)/etc
Modified: branches/cross/packages/bison/Makefile
===================================================================
--- branches/cross/packages/bison/Makefile 2006-07-12 08:09:58 UTC (rev
1604)
+++ branches/cross/packages/bison/Makefile 2006-07-12 08:21:02 UTC (rev
1605)
@@ -1,12 +1,12 @@
# Bison Makefile
NM= bison
-VRS= 2.1
+VRS= 2.3
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= b236923e7d4909c6fd8873ac87431833fa45069b
+SHA-$(FILE)= 7e489f35c6d8171f0cb0cad3dda0fb39f2cb0b62
# Targets
@@ -21,11 +21,7 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
-ifndef CROSS
./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr
-endif
echo '#define YYENABLE_NLS 1' >> config.h
make $(PM)
make install
Modified: branches/cross/packages/gawk/Makefile
===================================================================
--- branches/cross/packages/gawk/Makefile 2006-07-12 08:09:58 UTC (rev
1604)
+++ branches/cross/packages/gawk/Makefile 2006-07-12 08:21:02 UTC (rev
1605)
@@ -16,25 +16,13 @@
include $(ROOT)/scripts/functions
-ifndef CROSS
stage1: $(FILE) $(PATCH1)
$(std_build)
cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
-else
-stage1: $(FILE)
- $(std_build)
- cp $(SRC)/$(FILE) $(LFSSRC)
-endif
compile-stage1:
-ifndef CROSS
- ./configure --prefix=$(WD)
-else
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
--build=$(LFS_HOST) --host=$(LFS_TARGET)
-endif
- echo "#define HAVE_LANGINFO_CODESET 1" >> config.h
- echo "#define HAVE_LC_MESSAGES 1" >> config.h
make $(PM)
make install
@@ -47,13 +35,7 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
-ifndef CROSS
./configure --prefix=/usr --libexecdir=/usr/lib
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --libexecdir=/usr/lib64
-endif
- echo "#define HAVE_LANGINFO_CODESET 1" >> config.h
echo "#define HAVE_LC_MESSAGES 1" >> config.h
make $(PM)
make install
Modified: branches/cross/packages/iana-etc/Makefile
===================================================================
--- branches/cross/packages/iana-etc/Makefile 2006-07-12 08:09:58 UTC (rev
1604)
+++ branches/cross/packages/iana-etc/Makefile 2006-07-12 08:21:02 UTC (rev
1605)
@@ -1,12 +1,12 @@
# Iana-etc Makefile
NM= iana-etc
-VRS= 2.00
+VRS= 2.10
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= e4d9efb9076b8b18dc7add2236c68230a19b2607
+SHA-$(FILE)= 6a2960e42ccf3266680b7adb83f239c5a640220e
# Targets
Modified: branches/cross/packages/m4/Makefile
===================================================================
--- branches/cross/packages/m4/Makefile 2006-07-12 08:09:58 UTC (rev 1604)
+++ branches/cross/packages/m4/Makefile 2006-07-12 08:21:02 UTC (rev 1605)
@@ -12,15 +12,6 @@
include $(ROOT)/scripts/functions
-stage1: $(FILE)
- $(std_build)
- cp $(SRC)/$(FILE) $(LFSSRC)
-
-compile-stage1:
- ./configure --prefix=$(WD)
- make $(PM)
- make install
-
chroot:
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
@@ -29,15 +20,11 @@
$(std_build)
compile-stage2:
-ifndef CROSS
./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr
-endif
make $(PM)
make install
clean:
-rm -rf $(DIR)
-.PHONY: compile-stage1 clean chroot compile-stage2
+.PHONY: clean chroot compile-stage2
Modified: branches/cross/packages/module-init-tools/Makefile
===================================================================
--- branches/cross/packages/module-init-tools/Makefile 2006-07-12 08:09:58 UTC
(rev 1604)
+++ branches/cross/packages/module-init-tools/Makefile 2006-07-12 08:21:02 UTC
(rev 1605)
@@ -21,11 +21,7 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
-ifndef CROSS
./configure --prefix=/ --enable-zlib
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/ --enable-zlib
-endif
make $(PM)
make install
echo 'blacklist 8139cp' >/etc/modprobe.conf
Modified: branches/cross/packages/procps/Makefile
===================================================================
--- branches/cross/packages/procps/Makefile 2006-07-12 08:09:58 UTC (rev
1604)
+++ branches/cross/packages/procps/Makefile 2006-07-12 08:21:02 UTC (rev
1605)
@@ -21,13 +21,8 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage2:
-ifndef CROSS
make $(PM)
make install
-else
- make $(PM) CC="gcc $(64FLAGS)"
- make install lib64=$(LIB_LAYBE64)
-endif
clean:
-rm -rf $(DIR)
Modified: branches/cross/packages/sed/Makefile
===================================================================
--- branches/cross/packages/sed/Makefile 2006-07-12 08:09:58 UTC (rev
1604)
+++ branches/cross/packages/sed/Makefile 2006-07-12 08:21:02 UTC (rev
1605)
@@ -17,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=$(LFS_HOST) --host=$(LFS_TARGET)
make $(PM)
make install
@@ -34,13 +30,7 @@
$(std_build)
compile-stage2:
- sed -i 's@/doc@&/$(DIR)@' doc/Makefile.in
-ifndef CROSS
./configure --prefix=/usr --bindir=/bin --enable-html
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --bindir=/bin --enable-html
-endif
make $(PM)
make install
Modified: branches/cross/packages/texinfo/Makefile
===================================================================
--- branches/cross/packages/texinfo/Makefile 2006-07-12 08:09:58 UTC (rev
1604)
+++ branches/cross/packages/texinfo/Makefile 2006-07-12 08:21:02 UTC (rev
1605)
@@ -13,10 +13,6 @@
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= 2ead28cb8e2679cdb53e1e4908209f0a31397dfe
-PATCH50= $(DIR)-multibyte-1.patch
-URL-$(PATCH50)= $(HTTP)/$(NM)/$(PATCH50)
-SHA-$(PATCH50)= cb7f2c85a6f0ed73e8c4d1772e20b886a8c0de96
-
# Targets
include $(ROOT)/scripts/functions
@@ -26,11 +22,8 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
-ifndef CROSS
- ./configure --prefix=$(WD)
-else
- CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) --host=$(LFS_TARGET)
-endif
+ CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) --build=$(CLFS_HOST) \
+ --host=$(LFS_TARGET)
make $(PM)
make install
@@ -38,18 +31,13 @@
chroot "$(MP)" $(chenv-pre-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
-stage2: Makefile $(FILE) $(PATCH1) $(PATCH50)
+stage2: Makefile $(FILE) $(PATCH1)
$(std_build)
- cp $(SRC)/{$(PATCH1),$(PATCH50)} $(LFSSRC)
+ cp $(SRC)/$(PATCH1) $(LFSSRC)
compile-stage2:
patch -Np1 -i ../$(PATCH1)
- patch -Np1 -i ../$(PATCH50)
-ifndef CROSS
./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr
-endif
make $(PM)
make install
make TEXMF=/usr/share/texmf install-tex
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
