diff options
| author |   Panagiotis Christopoulos <pchrist@gentoo.org> | 2008-07-09 18:15:47 +0000 |
|---|---|---|
| committer | Panagiotis Christopoulos <pchrist@gentoo.org> | 2008-07-09 18:15:47 +0000 |
| commit | cfd8444b6f07cb1a5d765b74f9c554f34a1c4b6b (patch) | |
| tree | 2d41527085535af103ca27541502b90f1beedd8e /dev-scheme/scheme48/files | |
| parent | Update patch for sparc-fbsd, bug 231243. (diff) | |
| download | gentoo-2-cfd8444b6f07cb1a5d765b74f9c554f34a1c4b6b.tar.gz gentoo-2-cfd8444b6f07cb1a5d765b74f9c554f34a1c4b6b.tar.bz2 gentoo-2-cfd8444b6f07cb1a5d765b74f9c554f34a1c4b6b.zip | |
Apply patch for bug 227673, fixes DESTDIR, --as-needed and adds -D_GNU_SOURCE.Thanks to Shaughan Lavine <shaughan@arizona.edu>. Upstream informed. Old patches in FILESDIR, removed.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686)
Diffstat (limited to 'dev-scheme/scheme48/files')
3 files changed, 31 insertions, 27 deletions
diff --git a/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch b/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch deleted file mode 100644 index bbabf1239b12..000000000000 --- a/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.in.orig 2007-01-06 12:12:17.000000000 +0000 -+++ Makefile.in 2007-01-06 12:13:11.000000000 +0000 -@@ -222,8 +222,8 @@ - $(EXTERNAL_INITIALIZERS) && \ - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ c/main.o $(OBJS) $(UNIX_OBJS) \ - /tmp/s48_external_$$$$.c \ -- $(LIBOBJS) $(LIBS) \ -- $(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) && \ -+ $(LIBOBJS) \ -+ $(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) $(LIBS) && \ - rm -f /tmp/s48_external_$$$$.c - - script-interpreter: c/script-interpreter.o diff --git a/dev-scheme/scheme48/files/scheme48-1.5-as-needed.patch b/dev-scheme/scheme48/files/scheme48-1.5-as-needed.patch deleted file mode 100644 index c9e9a48ca4ce..000000000000 --- a/dev-scheme/scheme48/files/scheme48-1.5-as-needed.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -urwpN scheme48-1.5/Makefile.in scheme48-1.5.chg/Makefile.in ---- scheme48-1.5/Makefile.in 2007-01-06 14:14:10.000000000 -0400 -+++ scheme48-1.5.chg/Makefile.in 2007-01-20 00:54:53.000000000 -0400 -@@ -231,8 +231,8 @@ $(VM): c/main.o $(OBJS) $(UNIX_OBJS) $(L - $(EXTERNAL_INITIALIZERS) && \ - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ c/main.o $(OBJS) $(UNIX_OBJS) \ - /tmp/s48_external_$$$$.c \ -- $(LIBOBJS) $(LIBS) \ -- $(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) && \ -+ $(LIBOBJS) \ -+ $(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) $(LIBS) && \ - rm -f /tmp/s48_external_$$$$.c - - script-interpreter: c/script-interpreter.o diff --git a/dev-scheme/scheme48/files/scheme48-1.8-as-needed+fix_destdir.patch b/dev-scheme/scheme48/files/scheme48-1.8-as-needed+fix_destdir.patch new file mode 100644 index 000000000000..a6e050326871 --- /dev/null +++ b/dev-scheme/scheme48/files/scheme48-1.8-as-needed+fix_destdir.patch @@ -0,0 +1,31 @@ +--- Makefile.in.orig 2008-06-30 20:01:49.000000000 +0300 ++++ Makefile.in 2008-06-30 20:08:12.000000000 +0300 +@@ -8,7 +8,7 @@ + VPATH = @srcdir@ + CC = @CC@ + LD = @LD@ +-DEFS = @DEFS@ -D__COMPILING_SCHEME48_ITSELF__ -DS48_HOST_ARCHITECTURE=\"$(HOST_ARCHITECTURE)\" ++DEFS = @DEFS@ -D_GNU_SOURCE -D__COMPILING_SCHEME48_ITSELF__ -DS48_HOST_ARCHITECTURE=\"$(HOST_ARCHITECTURE)\" + LIBS = @LIBS@ + CFLAGS = @CFLAGS@ + CPPFLAGS = +@@ -286,8 +286,8 @@ + c/scheme48.exp c/scheme48.def + $(CC) $(LDFLAGS) $(LDFLAGS_VM) $(CFLAGS) -o $@ c/main.o \ + $(OBJS) $(GC_OBJS) $(UNIX_OBJS) \ +- $(LIBOBJS) $(LIBS) \ +- $(EXTERNAL_OBJECTS) ++ $(LIBOBJS) \ ++ $(EXTERNAL_OBJECTS) $(LIBS) + # Cygwin + if test -x /usr/bin/dlltool; then \ + dlltool --dllname $(VM).exe --output-lib $(VM).a --def $(srcdir)/c/scheme48.def; \ +@@ -409,7 +409,7 @@ + done + + inst-config-script: +- config_script=$(bindir)/$(CONFIG_SCRIPT) && \ ++ config_script=$(DESTDIR)$(bindir)/$(CONFIG_SCRIPT) && \ + sed -e 's,@incdir\@,$(incdir),g' \ + -e 's,@libdir\@,$(libdir),g' \ + -e 's,@CC\@,$(CC),g' \ |