r653 - x86/trunk/packages/kbd

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Sat Sep 17 17:25:07 PDT 2005


Author: jhuntwork
Date: 2005-09-17 18:25:02 -0600 (Sat, 17 Sep 2005)
New Revision: 653

Modified:
   x86/trunk/packages/kbd/Makefile
Log:
Updated kbd to work with gcc4.
Fixed stage2 dependencies and downloading of all patches.


Modified: x86/trunk/packages/kbd/Makefile
===================================================================
--- x86/trunk/packages/kbd/Makefile	2005-09-18 00:16:48 UTC (rev 652)
+++ x86/trunk/packages/kbd/Makefile	2005-09-18 00:25:02 UTC (rev 653)
@@ -20,7 +20,16 @@
 URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/downloads/$(NM)/$(PATCH2)
 SHA-$(PATCH2)= 3fe2f0e6a311b8a580f09472dae1b1abbbb7ad21
 
+PATCH3= $(DIR)-gcc4_fixes-1.patch
+URL-$(PATCH3)= $(HTTP)/$(NM)/$(PATCH3)
+SHA-$(PATCH3)= 93ec9885a79ff79088f1533ec52f1a87dae69500
 
+STAGE2-DEPS = $(FILE) $(BELARUSIAN_FILE) $(PATCH1) $(PATCH3)
+ifeq ($(ARCH),sparc)
+STAGE2-DEPS += $(PATCH2)
+endif
+
+
 # Targets
 # =============================================================================
 
@@ -30,9 +39,9 @@
 	@chroot "$(MP)" $(chenv-post-bash) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(BELARUSIAN_FILE) $(PATCH1)
+stage2: Makefile $(STAGE2-DEPS)
 	@$(std_build)
-	@cp $(SRC)/$(FILE) $(LFSSRC)
+	@cp $(SRC)/{$(FILE),$(PATCH3)} $(LFSSRC)
 
 compile-stage2:
 	@$(call echo_message, Configuring)
@@ -43,8 +52,8 @@
 	@zcat ../bellinux/console/keymaps/by2_win.kmap.gz > data/keymaps/i386/qwerty/by2_win.map
 	@sed -i -e 's/\(50 = 0x.\)A/\1C/' data/keymaps/i386/qwerty/by2_win.map
 	@patch -Np1 -i ../$(PATCH1)
+	@patch -Np1 -i ../$(PATCH3)
 ifeq ($(ARCH),sparc)
-	@cd .. ; wget $(URL-$(PATCH2))
 	@patch -Np1 -i ../$(PATCH2)
 endif
 	@./configure >../$(DIR)-$@.log 2>&1




More information about the livecd mailing list