diff --git a/package/base/e2fsprogs/e2fsprogs.conf b/package/base/e2fsprogs/e2fsprogs.conf index be348139b..6f4c03ee3 100644 --- a/package/base/e2fsprogs/e2fsprogs.conf +++ b/package/base/e2fsprogs/e2fsprogs.conf @@ -20,14 +20,17 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- +if [ "$ROCKCFG_DIETLIBC_e2fsprogs" == "1" ] ; then + confopt="$confopt --with-diet-libc" + [ "$dietlibc_dynamic_static" = "dynamic" ] && confopt="$confopt --enable-dynamic-e2fsck" +fi -confopt="$confopt --enable-fsck " -[ "$dietlibc_dynamic_static" = "dynamic" ] && confopt="$confopt --enable-dynamic-e2fsck" -confopt="$confopt --libdir=$root/lib --with-root-prefix=$root/" +confopt="$confopt --enable-fsck --libdir=$root/lib --with-root-prefix=$root/" -if [ $stagelevel -gt 1 ] +if [ $stagelevel -gt 1 -o "$crossnative" == "cross" ] ; then confopt="$confopt --enable-elf-shlibs" - makeinstopt="$makeinstopt install-libs" fi +# if you are brave, try without this and fix it... +LD=$CC diff --git a/package/sparc/silo/be-crosscompilable.patch b/package/sparc/silo/be-crosscompilable.patch new file mode 100644 index 000000000..602950b27 --- /dev/null +++ b/package/sparc/silo/be-crosscompilable.patch @@ -0,0 +1,31 @@ +--- ./second/Makefile.orig 2004-06-28 23:34:28.348996456 +0200 ++++ ./second/Makefile 2004-06-28 23:34:36.316785168 +0200 +@@ -85,7 +85,7 @@ + $(CC) $(CFLAGS) -c -o $@ $< + + util: util.c +- $(CC) -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC) -o $@ $< ++ $(HOST_CC) -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC) -o $@ $< + + clean: + $(RM) *.o fs/*.o second* silotftp* util fs/libfs.a +--- ./common/Makefile.orig 2004-06-28 23:32:28.987142216 +0200 ++++ ./common/Makefile 2004-06-28 23:33:46.917295032 +0200 +@@ -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: ++ $(HOST_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 --git a/package/sparc/silo/ls-c-include-order.patch b/package/sparc/silo/ls-c-include-order.patch new file mode 100644 index 000000000..3566b4452 --- /dev/null +++ b/package/sparc/silo/ls-c-include-order.patch @@ -0,0 +1,14 @@ +--- ./second/ls.c.orig 2004-06-28 21:28:22.725307784 +0200 ++++ ./second/ls.c 2004-06-28 21:28:29.333303216 +0200 +@@ -19,10 +19,10 @@ + USA. */ + + #include ++#include + #include + + typedef int FILE; +-#include + #include + #include + diff --git a/package/sparc/silo/no-ld-wrapper-workaround.patch b/package/sparc/silo/no-ld-wrapper-workaround.patch new file mode 100644 index 000000000..f1adab66f --- /dev/null +++ b/package/sparc/silo/no-ld-wrapper-workaround.patch @@ -0,0 +1,20 @@ +--- ./second/Makefile.orig 2004-06-28 23:13:27.167725152 +0200 ++++ ./second/Makefile 2004-06-28 23:14:28.531396456 +0200 +@@ -58,13 +58,13 @@ + $(AR) rc $@ $(FS_OBJS) + + second: $(OBJS) mark.o +- $(LD) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) -lext2fs mark.o +- $(LD) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) -lext2fs mark.o ++ $(LD) $(USELIB) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) -lext2fs mark.o ++ $(LD) $(USELIB) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) -lext2fs mark.o + $(NM) second | grep -v '*ABS*' | sort > second.map + + silotftp: $(OBJSNET) mark.o +- $(LD) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) -lext2fs mark.o +- $(LD) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) -lext2fs mark.o ++ $(LD) $(USELIB) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) -lext2fs mark.o ++ $(LD) $(USELIB) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) -lext2fs mark.o + $(NM) silotftp | grep -v '*ABS*' | sort > silotftp.map + + second.l: second diff --git a/package/sparc/silo/register-pseudoop.patch b/package/sparc/silo/register-pseudoop.patch new file mode 100644 index 000000000..20f37e3ac --- /dev/null +++ b/package/sparc/silo/register-pseudoop.patch @@ -0,0 +1,34 @@ +--- ./common/udivdi3.S.orig 2004-06-28 21:23:18.727522472 +0200 ++++ ./common/udivdi3.S 2004-06-28 21:24:00.399187416 +0200 +@@ -17,6 +17,8 @@ + the Free Software Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + ++ .register %g2,#scratch ++ + .text + .align 4 + .globl __udivdi3 +--- ./second/muldi3.S.orig 2004-06-28 21:29:22.416233384 +0200 ++++ ./second/muldi3.S 2004-06-28 21:29:44.663851232 +0200 +@@ -17,6 +17,8 @@ + the Free Software Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + ++ .register %g2,#scratch ++ + .text + .align 4 + .globl __muldi3 +--- ./common/divdi3.S.orig 2004-06-28 21:21:26.144637672 +0200 ++++ ./common/divdi3.S 2004-06-28 21:21:52.257667888 +0200 +@@ -17,6 +17,9 @@ + the Free Software Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + ++ .register %g3,#scratch ++ .register %g2,#scratch ++ + .data + .align 8 + .globl __clz_tab diff --git a/package/sparc/silo/silo.conf b/package/sparc/silo/silo.conf index 902694c5f..77855f8f9 100644 --- a/package/sparc/silo/silo.conf +++ b/package/sparc/silo/silo.conf @@ -33,4 +33,6 @@ pm_silo() { } hook_add postmake 3 pm_silo +var_append makeopt ' ' 'USELIB="-L $root/lib"' +var_append makeinstopt ' ' 'DESTDIR=$root' diff --git a/package/sparc/silo/silo.desc b/package/sparc/silo/silo.desc index 310cc3b9e..8f36a0635 100644 --- a/package/sparc/silo/silo.desc +++ b/package/sparc/silo/silo.desc @@ -42,8 +42,8 @@ [L] GPL [S] Stable -[V] 1.4.5 -[P] X -----5---9 202.400 +[V] 1.4.6 +[P] X -1---5---9 202.400 -[D] 2118780967 silo-1.4.5.tar.bz2 http://www.sparc-boot.org/pub/silo/ +[D] 2945190971 silo-1.4.6.tar.bz2 http://www.sparc-boot.org/pub/silo/