Author: justin
Date: 2005-10-01 15:51:21 -0600 (Sat, 01 Oct 2005)
New Revision: 819
Modified:
x86/trunk/packages/bison/Makefile
x86/trunk/packages/gawk/Makefile
x86/trunk/packages/man-pages/Makefile
x86/trunk/packages/nALFS-profile/Makefile
x86/trunk/packages/shadow/Makefile
x86/trunk/packages/udev/Makefile
x86/trunk/packages/util-linux/Makefile
Log:
Updated trunk to LFS development versions, added temp fix to nALFS-profile,
merged udev fixes from utf8-newmake, merged shadow changes from utf8-newmake.
Modified: x86/trunk/packages/bison/Makefile
===================================================================
--- x86/trunk/packages/bison/Makefile 2005-10-01 20:50:35 UTC (rev 818)
+++ x86/trunk/packages/bison/Makefile 2005-10-01 21:51:21 UTC (rev 819)
@@ -1,12 +1,12 @@
# Bison Makefile
NM= bison
-VRS= 2.0
+VRS= 2.1
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= fe1cafed51b9da77eb8253ad6cae6a880ca8ec7f
+SHA-$(FILE)= 0a3a5b3a506e4c406e6a82640058d3a29a309b84
# Targets
Modified: x86/trunk/packages/gawk/Makefile
===================================================================
--- x86/trunk/packages/gawk/Makefile 2005-10-01 20:50:35 UTC (rev 818)
+++ x86/trunk/packages/gawk/Makefile 2005-10-01 21:51:21 UTC (rev 819)
@@ -8,30 +8,37 @@
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 0d5694461f1c32f1eae41a1c0d7ba0939b47e369
+PATCH1= $(DIR)-segfault_fix-1.patch
+URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH)
+SHA-$(PATCH1)= 8dde8415d03b1897f50d5b12b6c876feda15e0be
+
# Targets
include $(ROOT)/scripts/functions
-stage1: $(FILE)
+stage1: $(FILE) $(PATCH1)
$(std_build)
- cp $(SRC)/$(FILE) $(LFSSRC)
+ cp $(SRC)/{$(FILE),$(PATCH1)} $(LFSSRC)
compile-stage1:
- sed -i 's,ISO-8859-8,ISO-8859-1,' po/it.po
- ./configure --prefix=$(WD) --libexecdir=$(WD)/lib
+ ./configure --prefix=$(WD)
+ echo "#define HAVE_LANGINFO_CODESET 1" >> config.h
+ echo "#define HAVE_LC_MESSAGES 1" >> config.h
make $(PM)
- make -C po update-gmo
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)
compile-stage2:
+ patch -Np1 -i ../$(PATCH1)
./configure --prefix=/usr --libexecdir=/usr/lib
+ echo "#define HAVE_LANGINFO_CODESET 1" >> config.h
+ echo "#define HAVE_LC_MESSAGES 1" >> config.h
make $(PM)
make install
Modified: x86/trunk/packages/man-pages/Makefile
===================================================================
--- x86/trunk/packages/man-pages/Makefile 2005-10-01 20:50:35 UTC (rev
818)
+++ x86/trunk/packages/man-pages/Makefile 2005-10-01 21:51:21 UTC (rev
819)
@@ -1,12 +1,12 @@
# Man-pages Makefile
NM= man-pages
-VRS= 2.07
+VRS= 2.08
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= df00926f4644549b7d136777458f93aad1648d4d
+SHA-$(FILE)= 9fdd9c61f860ac681199ca14092b83be99aeafc6
# Targets
Modified: x86/trunk/packages/nALFS-profile/Makefile
===================================================================
--- x86/trunk/packages/nALFS-profile/Makefile 2005-10-01 20:50:35 UTC (rev
818)
+++ x86/trunk/packages/nALFS-profile/Makefile 2005-10-01 21:51:21 UTC (rev
819)
@@ -21,6 +21,8 @@
compile-stage2:
sed -i 's@/your/$(DIR)/packages@/[EMAIL PROTECTED]' config/general.ent
+ # Temporary fix for LFS-6.1 profile
+ sed -i 's@/usr/local@/[EMAIL PROTECTED]' runit.sh
cp -rav . /root/nALFS-profile-$(DIR)
clean:
Modified: x86/trunk/packages/shadow/Makefile
===================================================================
--- x86/trunk/packages/shadow/Makefile 2005-10-01 20:50:35 UTC (rev 818)
+++ x86/trunk/packages/shadow/Makefile 2005-10-01 21:51:21 UTC (rev 819)
@@ -28,12 +28,13 @@
cp etc/{limits,login.access} /etc
sed -e '[EMAIL PROTECTED]@MD5_CRYPT_ENAB yes@' \
-e 's@/var/spool/mail@/var/mail@' \
+ -e '[EMAIL PROTECTED]@MAIL_CHECK_ENAB no@' \
etc/login.defs.linux > /etc/login.defs
mv /usr/bin/passwd /bin
mv /lib/libshadow.*a /usr/lib
rm /lib/libshadow.so
ln -sf ../../lib/libshadow.so.0 /usr/lib/libshadow.so
- mkdir /etc/default
+ mkdir -p /etc/default
pwconv
grpconv
Modified: x86/trunk/packages/udev/Makefile
===================================================================
--- x86/trunk/packages/udev/Makefile 2005-10-01 20:50:35 UTC (rev 818)
+++ x86/trunk/packages/udev/Makefile 2005-10-01 21:51:21 UTC (rev 819)
@@ -31,7 +31,7 @@
cp $(SRC)/$(CONFIG1) /etc/udev/rules.d/25-lfs.rules
echo 'RUN+="/sbin/udev_run_hotplugd"' >>/etc/udev/rules.d/25-lfs.rules
install -m644 -D docs/writing_udev_rules/index.html \
- /usr/share/doc/$(DIR)/index.html
+ /usr/share/doc/$(DIR)/index.html
/sbin/udevstart
clean:
Modified: x86/trunk/packages/util-linux/Makefile
===================================================================
--- x86/trunk/packages/util-linux/Makefile 2005-10-01 20:50:35 UTC (rev
818)
+++ x86/trunk/packages/util-linux/Makefile 2005-10-01 21:51:21 UTC (rev
819)
@@ -43,6 +43,7 @@
./configure
make $(PM) HAVE_KILL=yes HAVE_SLN=yes
make HAVE_KILL=yes HAVE_SLN=yes install
+ mv /usr/bin/logger /bin
clean:
-rm -rf $(DIR)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
