Author: justin
Date: 2005-12-07 17:05:33 -0700 (Wed, 07 Dec 2005)
New Revision: 1254
Modified:
trunk/packages/nfs-utils/Makefile
trunk/packages/tcpwrappers/Makefile
Log:
Merged r1253 from 6.1.1-newmake to trunk.
Modified: trunk/packages/nfs-utils/Makefile
===================================================================
--- trunk/packages/nfs-utils/Makefile 2005-12-08 00:02:42 UTC (rev 1253)
+++ trunk/packages/nfs-utils/Makefile 2005-12-08 00:05:33 UTC (rev 1254)
@@ -8,10 +8,6 @@
URL-$(FILE)= $(HTTPBLFS)/$(NM)/$(FILE)
SHA-$(FILE)= e216515f90f6ceb681f1527e5483d0ca53f8ac62
-PATCH1= $(DIR)-gcc4-1.patch
-URL-$(PATCH1)= $(HTTPBLFS)/$(NM)/$(PATCH1)
-SHA-$(PATCH1)= 9ccb151f6270aff4c5346ccc6ba50d5e7577ca65
-
# Targets
include $(ROOT)/scripts/functions
@@ -20,11 +16,10 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
$(std_build)
compile-stage2:
- patch -Np1 -i ../$(PATCH1)
./configure --prefix=/usr --sysconfdir=/etc --disable-nfsv4 \
--disable-gss
make
Modified: trunk/packages/tcpwrappers/Makefile
===================================================================
--- trunk/packages/tcpwrappers/Makefile 2005-12-08 00:02:42 UTC (rev 1253)
+++ trunk/packages/tcpwrappers/Makefile 2005-12-08 00:05:33 UTC (rev 1254)
@@ -12,10 +12,6 @@
URL-$(PATCH1)= $(HTTPBLFS)/tcp_wrappers/$(PATCH1)
SHA-$(PATCH1)= 915652d43c57f346d6f0a14eeaf706bbfed98ffa
-PATCH2= tcp_wrappers-$(VRS)-gcc34-1.patch
-URL-$(PATCH2)= $(HTTPBLFS)/tcp_wrappers/$(PATCH2)
-SHA-$(PATCH2)= 33ff5cb9d8d0c6a4baa1b31334613ec4781b4c30
-
# Targets
include $(ROOT)/scripts/functions
@@ -29,7 +25,7 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
- patch -Np1 -i ../$(PATCH2)
+ sed -i -e "s,^extern char \*malloc();,/* & */," scaffold.c
make $(PM) REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux
make install
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
