diff options
| author |   Martin von Gagern (MvG) <Martin.vGagern@gmx.net> | 2011-05-23 20:42:25 +0000 |
|---|---|---|
| committer | Martin von Gagern (MvG) <Martin.vGagern@gmx.net> | 2011-05-23 20:42:25 +0000 |
| commit | 8d18c848108de39180fdc55072bd42f04fe97362 (patch) | |
| tree | c03c9114271454a5a1ae9fd569cf3a664e486e90 /dev-util/eresi/files | |
| parent | dev-python/deform: New ebuild for bug 368051 (diff) | |
| download | sunrise-8d18c848108de39180fdc55072bd42f04fe97362.tar.gz sunrise-8d18c848108de39180fdc55072bd42f04fe97362.tar.bz2 sunrise-8d18c848108de39180fdc55072bd42f04fe97362.zip | |
dev-util/eresi: Fix a number of build issues discussed in bug #253436.
svn path=/sunrise/; revision=12083
Diffstat (limited to 'dev-util/eresi/files')
| -rw-r--r-- | dev-util/eresi/files/0.82_beta2-direct-ld.patch | 32 | ||||
| -rw-r--r-- | dev-util/eresi/files/0.82_beta2-gentoo-autodetect.patch | 17 | ||||
| -rw-r--r-- | dev-util/eresi/files/0.82_beta2-sed-in-Makefile.patch | 22 |
3 files changed, 71 insertions, 0 deletions
diff --git a/dev-util/eresi/files/0.82_beta2-direct-ld.patch b/dev-util/eresi/files/0.82_beta2-direct-ld.patch new file mode 100644 index 000000000..f3bb19c74 --- /dev/null +++ b/dev-util/eresi/files/0.82_beta2-direct-ld.patch @@ -0,0 +1,32 @@ +From: Nathan Phillip Brink <binki@gentoo.org> +Subject: Don't call LD when linking, use CC instead. + +--- a/libdump/Makefile ++++ b/libdump/Makefile +@@ -26,12 +26,12 @@ + all32: $(OBJ32) + $(AR) $(NAME32).a $(OBJ32) + $(RANLIB) $(NAME32).a +- $(LD) -r $(OBJ32) -o $(NAME32).o $(LDFLAGS32) ++ $(CC) -Wl,-r -nostdlib $(OBJ32) -o $(NAME32).o $(LDFLAGS32) + + all64: $(OBJ64) + $(AR) $(NAME64).a $(OBJ64) + $(RANLIB) $(NAME64).a +- $(LD) -r $(OBJ64) -o $(NAME64).o $(LDFLAGS64) ++ $(CC) -Wl,-r -nostdlib $(OBJ64) -o $(NAME64).o $(LDFLAGS64) + + clean : + @rm -f $(OBJ32) $(OBJ64) *~ *\# \#* .\#* dump_main.o + +--- a/elfsh/Makefile ++++ b/elfsh/Makefile +@@ -36,7 +36,7 @@ + -I../libedfmt/include/ $(STATOPT2) \ + $(ASMOPT) -DERESI64 $(NCURSESLNOPT) $(READLNOPT) + +-LDFLAGS32 += -L../libedfmt/ -ledfmt32 -L../libelfsh/ -lelfsh32 \ ++LDFLAGS32 += -L../libedfmt/ -ledfmt32 -L../libdump/ -L../libelfsh/ -lelfsh32 \ + -L../libetrace/ -letrace32 -L../libstderesi/ -lstderesi32 \ + -L/usr/pkg/lib/ -L../libmjollnir/ -lmjollnir32 \ + -L../libetrace -letrace32 $(LPTHREAD) -L../libasm/ -lasm32 \ diff --git a/dev-util/eresi/files/0.82_beta2-gentoo-autodetect.patch b/dev-util/eresi/files/0.82_beta2-gentoo-autodetect.patch new file mode 100644 index 000000000..d90fccdad --- /dev/null +++ b/dev-util/eresi/files/0.82_beta2-gentoo-autodetect.patch @@ -0,0 +1,17 @@ +Avoid autodetecting Gentoo using any kind of black magic. + +2011-05-23 Martin von Gagern + +Index: eresi-0.82_beta2/configure +=================================================================== +--- eresi-0.82_beta2.orig/configure ++++ eresi-0.82_beta2/configure +@@ -20,7 +20,7 @@ VARSFILE="librevm/include/revm-vars.h" + LIBVARSFILE="libelfsh/include/libvars.h" + LPTHREAD="-lpthread" + SHELL=`which bash` +-GENTOO=` uname -a | grep gentoo` ++GENTOO=yes + + printHelp() + { diff --git a/dev-util/eresi/files/0.82_beta2-sed-in-Makefile.patch b/dev-util/eresi/files/0.82_beta2-sed-in-Makefile.patch new file mode 100644 index 000000000..321e710cb --- /dev/null +++ b/dev-util/eresi/files/0.82_beta2-sed-in-Makefile.patch @@ -0,0 +1,22 @@ +Having a sed command at the top of the Makefile will break with +current (3.82) GNU make. + +2011-05-23 Martin von Gagern + +Index: eresi-0.82_beta2/configure +=================================================================== +--- eresi-0.82_beta2.orig/configure ++++ eresi-0.82_beta2/configure +@@ -618,10 +618,10 @@ echo "RM = rm -f " + echo "" >> Makefile + echo "all : world modules testsuite tags" >> Makefile + ++sed -ie "s%TESTING_ROOT=.*%TESTING_ROOT=`pwd`/%" eresi-config ++ + cat >> Makefile <<EOF + +-sed -ie "s%TESTING_ROOT=.*%TESTING_ROOT=`pwd`/%" eresi-config +- + ifdef NAME + include build/defs/dep-rules.def + component: dep-\$(NAME) |