summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-02-07 04:17:39 +0000
committerMike Frysinger <vapier@gentoo.org>2007-02-07 04:17:39 +0000
commit9587bfc789e9bbf4faae5d151871e929fcb22925 (patch)
tree7d533d3f8d3da16aef7b0f5bd058afb5ed770474 /sys-libs
parentMark 3.13 x86 stable, 4.02 version bump. (diff)
downloadgentoo-2-9587bfc789e9bbf4faae5d151871e929fcb22925.tar.gz
gentoo-2-9587bfc789e9bbf4faae5d151871e929fcb22925.tar.bz2
gentoo-2-9587bfc789e9bbf4faae5d151871e929fcb22925.zip
make sure we link against local gdbm rather than system one #165263
(Portage version: 2.1.2-r8)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch12
1 files changed, 8 insertions, 4 deletions
diff --git a/sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch b/sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch
index 6a77e3f64fbd..cebcf4e917ee 100644
--- a/sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch
+++ b/sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch
@@ -1,15 +1,19 @@
-Taken from Debian
+Since libgdbm_compat uses libgdbm, make sure we link it in.
http://bugs.gentoo.org/165263
--- gdbm-1.8.3/Makefile.in
+++ gdbm-1.8.3/Makefile.in
-@@ -161,7 +161,7 @@
- libgdbm_compat.la: $(C_LOBJS) gdbm.h
+@@ -161,10 +161,10 @@
+ $(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
+ -version-info $(SHLIB_VER) $(LOBJS)
+
+-libgdbm_compat.la: $(C_LOBJS) gdbm.h
++libgdbm_compat.la: $(C_LOBJS) gdbm.h libgdbm.la
rm -f libgdbm_compat.la
$(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
- -version-info $(SHLIB_VER) $(C_LOBJS)
-+ -version-info $(SHLIB_VER) $(C_LOBJS) -lgdbm
++ -version-info $(SHLIB_VER) $(C_LOBJS) libgdbm.la
gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2
rm -f gdbm.h