r576 - in x86/branches/utf8-newmake: . packages/gawk

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Fri Aug 19 01:45:07 PDT 2005


Author: alexander
Date: 2005-08-19 02:44:59 -0600 (Fri, 19 Aug 2005)
New Revision: 576

Modified:
   x86/branches/utf8-newmake/Makefile
   x86/branches/utf8-newmake/packages/gawk/Makefile
Log:
added gawk-3.1.5-invalid_free-1.patch

Modified: x86/branches/utf8-newmake/Makefile
===================================================================
--- x86/branches/utf8-newmake/Makefile	2005-08-17 02:16:31 UTC (rev 575)
+++ x86/branches/utf8-newmake/Makefile	2005-08-19 08:44:59 UTC (rev 576)
@@ -133,7 +133,7 @@
 	 cd $(ROOT) && make pre-bash $(chbash-pre-bash)'
 	@chroot "$(MP)" $(chenv-post-bash) 'set +h && cd $(ROOT) && \
 	 make post-bash $(chbash-post-bash)'
-	@ln -s $(WD)/bin/wget $(MP)/usr/bin/wget
+	@-ln -s $(WD)/bin/wget $(MP)/usr/bin/wget
 	@touch $@
 
 stop-here:

Modified: x86/branches/utf8-newmake/packages/gawk/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/gawk/Makefile	2005-08-17 02:16:31 UTC (rev 575)
+++ x86/branches/utf8-newmake/packages/gawk/Makefile	2005-08-19 08:44:59 UTC (rev 576)
@@ -9,6 +9,9 @@
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
 SHA-$(FILE)= 0d5694461f1c32f1eae41a1c0d7ba0939b47e369
 
+PATCH1= $(DIR)-invalid_free-1.patch
+URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1)
+SHA-$(PATCH1)= d04e8a694e1060e8f468874b165c33a95b8840f7
 # Targets
 # =============================================================================
 
@@ -56,7 +59,7 @@
 	@chroot "$(MP)" $(chenv-pre-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
 	@$(std_build)
 
 compile-stage2:
@@ -64,6 +67,7 @@
 #==============================================================================
 # Configure commands below \/
 #==============================================================================
+	@patch -Np1 -i ../$(PATCH1)
 	@./configure --prefix=/usr --libexecdir=/usr/lib >../$(DIR)-$@.log 2>&1
 	@echo "#define HAVE_ISBLANK 1" >>config.h
 	@echo "#define HAVE_LANGINFO_CODESET 1" >>config.h




More information about the livecd mailing list