r336 - in x86/trunk: . packages packages/flex packages/zlib

justin at linuxfromscratch.org justin at linuxfromscratch.org
Sun Jul 10 22:04:32 PDT 2005


Author: justin
Date: 2005-07-10 23:04:31 -0600 (Sun, 10 Jul 2005)
New Revision: 336

Added:
   x86/trunk/packages/nALFS-profile/
Modified:
   x86/trunk/Makefile
   x86/trunk/packages/flex/Makefile
   x86/trunk/packages/zlib/Makefile
Log:
Merged r321, r322, r323 from 6.1 to trunk.

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-07-11 04:47:24 UTC (rev 335)
+++ x86/trunk/Makefile	2005-07-11 05:04:31 UTC (rev 336)
@@ -180,7 +180,8 @@
 	ch-startup-notification ch-gvim ch-xfce ch-lua ch-ion ch-irssi ch-xchat ch-tcpwrappers ch-portmap \
 	ch-nfs-utils ch-traceroute ch-dialog ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 ch-dhcpcd \
 	ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs ch-squashfs ch-cpio ch-mutt ch-msmtp ch-slrn \
-	ch-raidtools ch-eject ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux
+	ch-raidtools ch-eject ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux \
+	ch-nALFS-profile
 
 # Rules for building tools/stage1
 # These can be called individually, if necessary
@@ -891,6 +892,10 @@
 	make -C $(PKG)/$@ chroot
 	make unmount
 
+nALFS-profile: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
 initramfs: prep-chroot
 	make -C $@ chroot
 	make unmount
@@ -1416,6 +1421,9 @@
 ch-unionfs: popdev
 	make -C $(PKG)/unionfs stage2
 
+ch-nALFS-profile: popdev
+	make -C $(PKG)/nALFS-profile stage2
+
 ch-strip: popdev
 	@$(WD)/bin/find /{,usr/}{bin,lib,sbin} -type f -exec $(WD)/bin/strip --strip-debug '{}' ';'
 

Modified: x86/trunk/packages/flex/Makefile
===================================================================
--- x86/trunk/packages/flex/Makefile	2005-07-11 04:47:24 UTC (rev 335)
+++ x86/trunk/packages/flex/Makefile	2005-07-11 05:04:31 UTC (rev 336)
@@ -5,7 +5,7 @@
 VRS= 2.5.31
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
-PATCH= $(DIR)-debian_fixes-2.patch
+PATCH= $(DIR)-debian_fixes-3.patch
 URL= $(HTTP)/$(NM)/$(FILE)
 URL1= $(HTTP)/$(NM)/$(PATCH)
 

Copied: x86/trunk/packages/nALFS-profile (from rev 323, x86/branches/6.1/packages/nALFS-profile)

Modified: x86/trunk/packages/zlib/Makefile
===================================================================
--- x86/trunk/packages/zlib/Makefile	2005-07-11 04:47:24 UTC (rev 335)
+++ x86/trunk/packages/zlib/Makefile	2005-07-11 05:04:31 UTC (rev 336)
@@ -26,7 +26,7 @@
          mv $(PATCH1) $(SRC) ; fi
 	@if [ ! -f /usr/lib/libz.so ] ; then unpack $(SRC)/$(FILE) && \
 	 cd $(DIR) && patch -Np1 -i $(SRC)/$(PATCH1) && \
-	 ./configure --prefix=/usr --shared && \
+	 ./configure --prefix=/usr --shared --libdir=/lib && \
 	 make -j3 && make install && make clean && ./configure --prefix=/usr && \
 	 make -j3 && make install && chmod 644 /usr/lib/libz.a && \
 	 mv /usr/lib/libz.so.* /lib && \




More information about the livecd mailing list