summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/qdbm/files/qdbm-runpath.diff')
-rw-r--r--dev-db/qdbm/files/qdbm-runpath.diff68
1 files changed, 35 insertions, 33 deletions
diff --git a/dev-db/qdbm/files/qdbm-runpath.diff b/dev-db/qdbm/files/qdbm-runpath.diff
index d67e27c23e02..c1bd25e50a4e 100644
--- a/dev-db/qdbm/files/qdbm-runpath.diff
+++ b/dev-db/qdbm/files/qdbm-runpath.diff
@@ -1,34 +1,36 @@
---- perl/Makefile.in.orig 2005-10-09 16:35:47.000000000 +1000
-+++ perl/Makefile.in 2005-10-09 16:41:46.000000000 +1000
-@@ -43,15 +43,15 @@
- cd depot && [ -f Makefile ] || \
- $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
-- $(RUNENV) make
-+ $(RUNENV) make LD_RUN_PATH=""
- cd curia && [ -f Makefile ] || \
- $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
-- $(RUNENV) make
-+ $(RUNENV) make LD_RUN_PATH=""
- cd villa && [ -f Makefile ] || \
- $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
- LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
-- $(RUNENV) make
-+ $(RUNENV) make LD_RUN_PATH=""
- @printf '\n'
- @printf '#================================================================\n'
- @printf '# Ready to install.\n'
-@@ -69,9 +69,9 @@
+diff -urN qdbm-1.8.62.orig/Makefile.in qdbm-1.8.62/Makefile.in
+--- qdbm-1.8.62.orig/Makefile.in 2006-06-07 19:47:55.000000000 +0900
++++ qdbm-1.8.62/Makefile.in 2006-07-22 23:43:44.000000000 +0900
+@@ -61,7 +61,7 @@
+ LIBS = -lqdbm @LIBS@
+ LIBLDFLAGS = -L. -L$(HOME)/lib -L/usr/local/lib @LIBS@
+ LDFLAGS = -L. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(MYLIBDIR)
++LDENV =
+ AR = @AR@
+ ARFLAGS = rcsv
+ RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(HOME)/lib:/usr/local/lib
+diff -urN qdbm-1.8.62.orig/cgi/Makefile.in qdbm-1.8.62/cgi/Makefile.in
+--- qdbm-1.8.62.orig/cgi/Makefile.in 2004-08-18 20:16:40.000000000 +0900
++++ qdbm-1.8.62/cgi/Makefile.in 2006-07-22 23:44:56.000000000 +0900
+@@ -29,7 +29,7 @@
+ CFLAGS = -Wall -ansi -pedantic -fsigned-char $(RELCFLAGS)
+ LIBS = -lqdbm @LIBS@
+ LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib
++LDENV =
-
- install :
-- cd depot && $(RUNENV) make install
-- cd curia && $(RUNENV) make install
-- cd villa && $(RUNENV) make install
-+ cd depot && $(RUNENV) make LD_RUN_PATH="" install
-+ cd curia && $(RUNENV) make LD_RUN_PATH="" install
-+ cd villa && $(RUNENV) make LD_RUN_PATH="" install
- mkdir -p $(DESTDIR)$(MYBINDIR)
- cp -f $(MYBINS) $(DESTDIR)$(MYBINDIR)
- mkdir -p $(DESTDIR)$(MYDATADIR)
+ # Install destinations
+ prefix = @prefix@
+diff -urN qdbm-1.8.62.orig/plus/Makefile.in qdbm-1.8.62/plus/Makefile.in
+--- qdbm-1.8.62.orig/plus/Makefile.in 2006-06-01 22:56:55.000000000 +0900
++++ qdbm-1.8.62/plus/Makefile.in 2006-07-22 23:46:26.000000000 +0900
+@@ -49,7 +49,7 @@
+ LIBS = -lqdbm @LIBS@
+ LIBLDFLAGS = -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+ LDFLAGS = -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(MYLIBDIR)
++LDENV =
+ AR = @AR@
+ ARFLAGS = rcsv
+ RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(HOME)/lib:/usr/local/lib