diff options
| author |   Akinori Hattori <hattya@gentoo.org> | 2007-03-12 14:04:29 +0000 |
|---|---|---|
| committer | Akinori Hattori <hattya@gentoo.org> | 2007-03-12 14:04:29 +0000 |
| commit | 1bc4b94274d9ae020a54f383eec69cc7507b4b83 (patch) | |
| tree | 4ea58114d96e6fee73d5898bc305762f664b4df4 /dev-db/qdbm/files | |
| parent | Replacing einfo with elog (diff) | |
| download | gentoo-2-1bc4b94274d9ae020a54f383eec69cc7507b4b83.tar.gz gentoo-2-1bc4b94274d9ae020a54f383eec69cc7507b4b83.tar.bz2 gentoo-2-1bc4b94274d9ae020a54f383eec69cc7507b4b83.zip | |
fixes bug #170523.
(Portage version: 2.1.2.2)
Diffstat (limited to 'dev-db/qdbm/files')
| -rw-r--r-- | dev-db/qdbm/files/qdbm-1.8.75-runpath.diff | 36 | ||||
| -rw-r--r-- | dev-db/qdbm/files/qdbm-perl-runpath.diff | 34 |
2 files changed, 36 insertions, 34 deletions
diff --git a/dev-db/qdbm/files/qdbm-1.8.75-runpath.diff b/dev-db/qdbm/files/qdbm-1.8.75-runpath.diff new file mode 100644 index 000000000000..cde2c65d8906 --- /dev/null +++ b/dev-db/qdbm/files/qdbm-1.8.75-runpath.diff @@ -0,0 +1,36 @@ +diff -urN qdbm-1.8.75.orig/Makefile.in qdbm-1.8.75/Makefile.in +--- qdbm-1.8.75.orig/Makefile.in 2007-02-21 17:44:33.000000000 +0900 ++++ qdbm-1.8.75/Makefile.in 2007-03-06 22:28:09.573574612 +0900 +@@ -60,7 +60,7 @@ + LIBS = -lqdbm @LIBS@ + LIBLDFLAGS = -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@ + LDFLAGS = -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS) +-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib ++LDENV = + AR = @AR@ + ARFLAGS = rcsv + RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib +diff -urN qdbm-1.8.75.orig/cgi/Makefile.in qdbm-1.8.75/cgi/Makefile.in +--- qdbm-1.8.75.orig/cgi/Makefile.in 2006-08-24 11:55:12.000000000 +0900 ++++ qdbm-1.8.75/cgi/Makefile.in 2007-03-06 22:28:57.918463514 +0900 +@@ -28,7 +28,7 @@ + CFLAGS = -Wall -ansi -pedantic -fsigned-char -O2 + 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 destinations + prefix = @prefix@ +diff -urN qdbm-1.8.75.orig/plus/Makefile.in qdbm-1.8.75/plus/Makefile.in +--- qdbm-1.8.75.orig/plus/Makefile.in 2007-02-21 17:47:23.000000000 +0900 ++++ qdbm-1.8.75/plus/Makefile.in 2007-03-06 22:28:50.954878529 +0900 +@@ -48,7 +48,7 @@ + LIBS = -lqdbm @LIBS@ + LIBLDFLAGS = -L. -L$(srcdir)/.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS) + LDFLAGS = -L. -L$(srcdir)/.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS) +-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib ++LDENV = + AR = @AR@ + ARFLAGS = rcsv + RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib diff --git a/dev-db/qdbm/files/qdbm-perl-runpath.diff b/dev-db/qdbm/files/qdbm-perl-runpath.diff deleted file mode 100644 index d67e27c23e02..000000000000 --- a/dev-db/qdbm/files/qdbm-perl-runpath.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 @@ - - - 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) |