Author: justin
Date: 2006-07-12 02:43:39 -0600 (Wed, 12 Jul 2006)
New Revision: 1607
Modified:
branches/cross/packages/bash/Makefile
branches/cross/packages/findutils/Makefile
branches/cross/packages/gawk/Makefile
branches/cross/packages/gettext/Makefile
branches/cross/packages/grep/Makefile
branches/cross/packages/gzip/Makefile
branches/cross/packages/make/Makefile
branches/cross/packages/patch/Makefile
branches/cross/packages/sed/Makefile
branches/cross/packages/tar/Makefile
branches/cross/packages/texinfo/Makefile
branches/cross/packages/util-linux/Makefile
branches/cross/packages/wget/Makefile
Log:
More temporary system build upgrades.
Modified: branches/cross/packages/bash/Makefile
===================================================================
--- branches/cross/packages/bash/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/bash/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -28,7 +28,7 @@
echo "ac_cv_func_setvbuf_reversed=no" >> config.cache
CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" \
./configure --prefix=$(WD) --build=$(CLFS_HOST) \
- --host=$(LFS_TARGET) --without-bash-malloc \
+ --host=$(CLFS_TARGET) --without-bash-malloc \
--cache-file=config.cache
make
make install
Modified: branches/cross/packages/findutils/Makefile
===================================================================
--- branches/cross/packages/findutils/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/findutils/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -19,7 +19,7 @@
compile-stage1:
echo "am_cv_func_working_getline=yes" >> config.cache
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
- --build=$(CLFS_HOST) --host=$(LFS_TARGET) --cache-file=config.cache
+ --build=$(CLFS_HOST) --host=$(CLFS_TARGET) --cache-file=config.cache
make $(PM)
make install
Modified: branches/cross/packages/gawk/Makefile
===================================================================
--- branches/cross/packages/gawk/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/gawk/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -22,7 +22,7 @@
compile-stage1:
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
- --build=$(LFS_HOST) --host=$(LFS_TARGET)
+ --build=$(CLFS_HOST) --host=$(CLFS_TARGET)
make $(PM)
make install
Modified: branches/cross/packages/gettext/Makefile
===================================================================
--- branches/cross/packages/gettext/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/gettext/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -17,14 +17,10 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
-ifndef CROSS
- cd $(NM)-tools ; ./configure --prefix=$(WD) --disable-shared
-else
cd $(NM)-tools ; echo "am_cv_func_working_getline=yes" >> config.cache
cd $(NM)-tools ; CC="$${CC} $(64FLAGS)" CXX="$${CXX} $(64FLAGS)" \
- ./configure --prefix=$(WD) --host=$(LFS_TARGET) --disable-shared \
- --cache-file=config.cache
-endif
+ ./configure --prefix=$(WD) --build=$(CLFS_HOST) --host=$(CLFS_TARGET) \
+ --disable-shared --cache-file=config.cache
cd $(NM)-tools ; make -C lib
cd $(NM)-tools ; make -C src msgfmt
cd $(NM)-tools ; cp -v src/msgfmt $(WD)/bin
@@ -37,15 +33,7 @@
$(std_build)
compile-stage2:
-ifndef CROSS
./configure --prefix=/usr
-else
-ifeq ($(LFS-ARCH),x86_64)
- sed -i -e '2iexit 77' autoconf-lib-link/tests/rpath-3*[ef]
-endif
- CC="gcc $(64FLAGS)" CXX="g++ $(64FLAGS)" \
- ./configure --prefix=/usr --libdir=/usr/lib64
-endif
make
make install
Modified: branches/cross/packages/grep/Makefile
===================================================================
--- branches/cross/packages/grep/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/grep/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -1,8 +1,5 @@
# Grep Makefile
-# Do not update this package before RedHat! Some of the fixes are scheduled
-# for grep-2.5.3, not 2.5.2
-
NM= grep
VRS= 2.5.1a
DIR= $(NM)-$(VRS)
@@ -11,25 +8,17 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 2cd082775d30be463c0ac674a00595eb56fda22e
-PATCH50= $(DIR)-redhat_fixes-2.patch
-URL-$(PATCH50)= $(HTTP)/$(NM)/$(PATCH50)
-SHA-$(PATCH50)= 6f7f1623d1909f07dc08a8a16a24cbce6be8dfc5
-
# Targets
include $(ROOT)/scripts/functions
stage1: $(FILE)
- $(std_build) # See the scripts/functions file for functions like this
+ $(std_build)
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
-ifndef CROSS
- ./configure --prefix=$(WD) --disable-perl-regexp
-else
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
- --host=$(LFS_TARGET) --disable-perl-regexp
-endif
+ --build=$(CLFS_HOST) --host=$(CLFS_TARGET) --disable-perl-regexp
make $(PM)
make install
@@ -37,18 +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 --bindir=/bin
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --bindir=/bin
-endif
make $(PM)
make install
Modified: branches/cross/packages/gzip/Makefile
===================================================================
--- branches/cross/packages/gzip/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/gzip/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -21,14 +21,10 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
-ifndef CROSS
- ./configure --prefix=$(WD)
-else
- cp configure{,.bak}
- sed "[EMAIL PROTECTED] [EMAIL PROTECTED](LFS_TARGET)-&@" configure.bak
> configure
- CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
- --host=$(LFS_TARGET)
-endif
+ cp configure{,.orig}
+ sed "[EMAIL PROTECTED] [EMAIL PROTECTED](CLFS_TARGET)-&@"
configure.orig > configure
+ CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) --build=$(CLFS_HOST) \
+ --host=$(CLFS_TARGET)
make $(PM)
make install
@@ -42,20 +38,16 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
-ifndef CROSS
./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr
-endif
sed -i 's@"BINDIR"@/[EMAIL PROTECTED]' gzexe.in
make $(PM)
make install
mv -v /usr/bin/gzip /bin
rm -v /usr/bin/{gunzip,zcat}
- ln -sfv gzip /bin/gunzip
- ln -sfv gzip /bin/zcat
- ln -sfv gzip /bin/compress
- ln -sfv gunzip /bin/uncompress
+ ln -sv gzip /bin/gunzip
+ ln -sv gzip /bin/zcat
+ ln -sv gzip /bin/compress
+ ln -sv gunzip /bin/uncompress
clean:
-rm -rf $(DIR)
Modified: branches/cross/packages/make/Makefile
===================================================================
--- branches/cross/packages/make/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/make/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -1,12 +1,12 @@
# Make Makefile
NM= make
-VRS= 3.80
+VRS= 3.81
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= d2085842f08e57d58d3e1cd75a5f0342a60e5f45
+SHA-$(FILE)= 41ed86d941b9c8025aee45db56c0283169dcab3d
# Targets
@@ -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=$(CLFS_HOST) --host=$(CLFS_TARGET)
make $(PM)
make install
@@ -34,11 +30,7 @@
$(std_build)
compile-stage2:
-ifndef CROSS
./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr
-endif
make $(PM)
make install
Modified: branches/cross/packages/patch/Makefile
===================================================================
--- branches/cross/packages/patch/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/patch/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -1,12 +1,12 @@
# Patch Makefile
NM= patch
-VRS= 2.5.4
+VRS= 2.5.9
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= a12d520eba0dc35d1c4d50ec75b7684451a40de9
+SHA-$(FILE)= 9a69f7191576549255f046487da420989d2834a6
# Targets
@@ -17,13 +17,8 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
-ifndef CROSS
- # CPPFLAGS=-D_GNU_SOURCE is for ppc
- CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=$(WD)
-else
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
- --host=$(LFS_TARGET)
-endif
+ --build-$(CLFS_HOST) --host=$(CLFS_TARGET)
make $(PM)
make install
@@ -35,11 +30,7 @@
$(std_build)
compile-stage2:
-ifndef CROSS
- CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/usr
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr
-endif
+ ./configure --prefix=/usr
make $(PM)
make install
Modified: branches/cross/packages/sed/Makefile
===================================================================
--- branches/cross/packages/sed/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/sed/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -18,7 +18,7 @@
compile-stage1:
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
- --build=$(LFS_HOST) --host=$(LFS_TARGET)
+ --build=$(CLFS_HOST) --host=$(CLFS_TARGET)
make $(PM)
make install
Modified: branches/cross/packages/tar/Makefile
===================================================================
--- branches/cross/packages/tar/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/tar/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -24,19 +24,14 @@
include $(ROOT)/scripts/functions
-stage1: $(FILE) $(PATCH1)
+stage1: $(FILE)
$(std_build)
- cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)/
+ cp $(SRC)/$(FILE) $(LFSSRC)/
compile-stage1:
-ifndef CROSS
- patch -Np1 -i ../$(PATCH1)
- ./configure --prefix=$(WD)
-else
echo "am_cv_func_working_getline=yes" >> config.cache
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) \
- --host=$(LFS_TARGET) --cache-file=config.cache
-endif
+ --build=$(CLFS_HOST) --host=$(CLFS_TARGET) --cache-file=config.cache
make $(PM)
make install
@@ -46,18 +41,13 @@
stage2: Makefile $(FILE) $(PATCH1) $(PATCH2) $(PATCH3)
$(std_build)
- cp $(SRC)/{$(PATCH2),$(PATCH3)} $(LFSSRC)
+ cp $(SRC)/{$(PATCH1),$(PATCH2),$(PATCH3)} $(LFSSRC)
compile-stage2:
patch -Np1 -i ../$(PATCH1)
patch -Np1 -i ../$(PATCH2)
patch -Np1 -i ../$(PATCH3)
-ifndef CROSS
./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin
-else
- CC="gcc $(64FLAGS)" ./configure --prefix=/usr \
- --bindir=/bin --libexecdir=/usr/sbin
-endif
make $(PM)
make install
Modified: branches/cross/packages/texinfo/Makefile
===================================================================
--- branches/cross/packages/texinfo/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/texinfo/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -23,7 +23,7 @@
compile-stage1:
CC="$${CC} $(64FLAGS)" ./configure --prefix=$(WD) --build=$(CLFS_HOST) \
- --host=$(LFS_TARGET)
+ --host=$(CLFS_TARGET)
make $(PM)
make install
Modified: branches/cross/packages/util-linux/Makefile
===================================================================
--- branches/cross/packages/util-linux/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/util-linux/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -12,64 +12,50 @@
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
SHA-$(PATCH1)= 00f5192493b939c2c996df9c1f3f769abfa3fa8c
-PATCH31= $(DIR)-gcc4_fixes-1.patch
-URL-$(PATCH31)=
http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH31)
-SHA-$(PATCH31)= 638972c2f2b09cf20aac60ede91e803a96cea4d9
+PATCH2= $(DIR)-gcc4_fixes-1.patch
+URL-$(PATCH2)= $(HTTP)/$(NM)/$(PATCH2)
+SHA-$(PATCH2)= 638972c2f2b09cf20aac60ede91e803a96cea4d9
-STAGE1_DEPS = $(FILE)
-STAGE2_DEPS = $(FILE) $(PATCH1)
+PATCH3= $(DIR)-missing_header-1.patch
+URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
+SHA-$(PATCH3)= 63e2ff9cd87d986d4169202646b21044f2171c23
-ifdef CROSS
-STAGE1_DEPS+= $(PATCH31)
-STAGE2_DEPS+= $(PATCH31)
-endif
-
# Targets
include $(ROOT)/scripts/functions
-stage1: $(STAGE1_DEPS)
+stage1: $(FILE) $(PATCH2)
$(std_build)
- for i in $(STAGE1_DEPS) ; do cp $(SRC)/$$i $(LFSSRC) ; done
+ cp $(SRC)/{$(FILE),$(PATCH2)} $(LFSSRC)
compile-stage1:
- sed -i 's@/usr/[EMAIL PROTECTED](WD)/[EMAIL PROTECTED]' configure
-ifndef CROSS
- ./configure
- make -C lib
- make -C mount mount umount
- make -C text-utils more
-else
- patch -Np1 -i ../$(PATCH31)
- cp -v configure configure.orig
+ patch -Np1 -i ../$(PATCH2)
+ cp -v configure{,.orig}
sed -e 's@/usr/[EMAIL PROTECTED](WD)/[EMAIL PROTECTED]' configure.orig
> configure
CC="$${CC} $(64FLAGS)" ./configure
make ARCH="" CPU="" -C lib
make ARCH="" CPU="" -C mount mount umount
make ARCH="" CPU="" -C text-utils more
-endif
cp mount/{,u}mount text-utils/more $(WD)/bin
chroot:
chroot "$(MP)" $(chenv-post-bash) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(STAGE2_DEPS)
+stage2: Makefile $(FILE) $(PATCH1) $(PATCH3)
$(std_build)
- cp $(SRC)/$(PATCH1) $(LFSSRC)/
+ cp $(SRC)/{$(PATCH1),$(PATCH3)} $(LFSSRC)/
compile-stage2:
sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED]/lib/hwclock/[EMAIL
PROTECTED]' hwclock/hwclock.c
- mkdir -p /var/lib/hwclock
+ mkdir -pv /var/lib/hwclock
patch -Np1 -i ../$(PATCH1)
-ifndef CROSS
+ patch -Np1 -i ../$(PATCH2)
+ patch -Np1 -i ../$(PATCH3)
./configure
-else
- patch -Np1 -i ../$(PATCH31)
- CC="gcc $(64FLAGS)" ./configure
-endif
make $(PM) HAVE_KILL=yes HAVE_SLN=yes
make HAVE_KILL=yes HAVE_SLN=yes install
+ mv -v /usr/bin/logger /bin
clean:
-rm -rf $(DIR)
Modified: branches/cross/packages/wget/Makefile
===================================================================
--- branches/cross/packages/wget/Makefile 2006-07-12 08:24:58 UTC (rev
1606)
+++ branches/cross/packages/wget/Makefile 2006-07-12 08:43:39 UTC (rev
1607)
@@ -30,7 +30,8 @@
compile-stage1:
./configure --prefix=$(WD) --libdir=$(WD)/lib --without-ssl \
- --enable-static --disable-shared --disable-nls --host=$(LFS_TARGET)
+ --enable-static --disable-shared --disable-nls --build=$(CLFS_HOST) \
+ --host=$(CLFS_TARGET)
make $(PM)
make install
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
