Author: jim Date: 2005-07-03 01:35:31 -0600 (Sun, 03 Jul 2005) New Revision: 998
Added: trunk/silo/ trunk/silo/silo-1.4.9-fixes-1.patch Modified: trunk/ Log: [EMAIL PROTECTED]: jim | 2005-07-03 00:10:12 -0700 Added: silo-1.4.9-fixes-1.patch Property changes on: trunk ___________________________________________________________________ Name: svk:merge - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1027 + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1029 Added: trunk/silo/silo-1.4.9-fixes-1.patch =================================================================== --- trunk/silo/silo-1.4.9-fixes-1.patch 2005-07-02 07:37:21 UTC (rev 997) +++ trunk/silo/silo-1.4.9-fixes-1.patch 2005-07-03 07:35:31 UTC (rev 998) @@ -0,0 +1,53 @@ +Submitted By: Jim Gifford (patches at jg555 dot com) +Date: 2005-07-02 +Initial Package Version: 1.4.9 +Origin: Jbit, mdh, and Jim Gifford +Upstream Status: Sent +Description: Allows Silo to be built under Cross-LFS + +diff -Naur silo-1.4.9.orig/Rules.make silo-1.4.9/Rules.make +--- silo-1.4.9.orig/Rules.make 2005-03-15 16:41:01.000000000 +0000 ++++ silo-1.4.9/Rules.make 2005-07-03 06:54:38.000000000 +0000 +@@ -3,7 +3,8 @@ + RM=rm -f + # We want to force 32-bit builds + CC=gcc -m32 +-LD=ld ++BUILD_CC=gcc ++LD=ld -m elf32_sparc + AS=as + STRIP=strip + NM=nm +diff -Naur silo-1.4.9.orig/common/Makefile silo-1.4.9/common/Makefile +--- silo-1.4.9.orig/common/Makefile 2004-06-20 17:16:32.000000000 +0000 ++++ silo-1.4.9/common/Makefile 2005-07-03 06:06:45.000000000 +0000 +@@ -12,12 +12,15 @@ + + OBJS = sdiv.o rem.o udiv.o urem.o jmp.o printf.o console.o prom.o tree.o stringops2.o\ + stringops1.o ffs.o divdi3.o udivdi3.o +-PROGRAMS = bin2h + +-all: $(OBJS) $(PROGRAMS) ++bin2h: ++ $(BUILD_CC) $(CFLAGS) -o bin2h bin2h.c ++ ++all: $(OBJS) bin2h + + prom.o: prom.c + $(CC) $(CFLAGS) -c -Wa,-Av9 -o prom.o prom.c + + clean: + $(RM) $(PROGRAMS) *.o ++ +diff -Naur silo-1.4.9.orig/second/Makefile silo-1.4.9/second/Makefile +--- silo-1.4.9.orig/second/Makefile 2004-06-20 17:16:32.000000000 +0000 ++++ silo-1.4.9/second/Makefile 2005-07-03 06:54:06.000000000 +0000 +@@ -85,7 +85,7 @@ + $(CC) $(CFLAGS) -c -o $@ $< + + util: util.c +- $(CC) -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC) -o $@ $< ++ $(BUILD_CC) -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC) -o $@ $< + + clean: + $(RM) *.o fs/*.o second* silotftp* util fs/libfs.a -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
