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
commit1858dc61bb3817bca38dca5335ae0f27d2927812 (patch)
treea480e45634fd0f6111e930ac00fd3a89c0daaf59 /sys-libs/gdbm
parentMark 3.13 x86 stable, 4.02 version bump. (diff)
downloadhistorical-1858dc61bb3817bca38dca5335ae0f27d2927812.tar.gz
historical-1858dc61bb3817bca38dca5335ae0f27d2927812.tar.bz2
historical-1858dc61bb3817bca38dca5335ae0f27d2927812.zip
make sure we link against local gdbm rather than system one #165263
Package-Manager: portage-2.1.2-r8
Diffstat (limited to 'sys-libs/gdbm')
-rw-r--r--sys-libs/gdbm/Manifest14
-rw-r--r--sys-libs/gdbm/files/gdbm-1.8.3-compat-linking.patch12
2 files changed, 15 insertions, 11 deletions
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 812a85c867d8..80b4c5e91fc4 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX gdbm-1.8.3-compat-linking.patch 409 RMD160 f80695aa404dbee8da4ef2dbac6e38e63883b5e9 SHA1 8d1b2929215c04faf96e082a2622ff016eb934c5 SHA256 49e10c9edd6be4371431b633605de0be6e0a8bb8bf21386f6c749b20a0d5f217
-MD5 d656d161130b93a1361ee861858056bc files/gdbm-1.8.3-compat-linking.patch 409
-RMD160 f80695aa404dbee8da4ef2dbac6e38e63883b5e9 files/gdbm-1.8.3-compat-linking.patch 409
-SHA256 49e10c9edd6be4371431b633605de0be6e0a8bb8bf21386f6c749b20a0d5f217 files/gdbm-1.8.3-compat-linking.patch 409
+AUX gdbm-1.8.3-compat-linking.patch 611 RMD160 f144f776f38acb1ea046009b2de0376b5149edb9 SHA1 b8fa52996a9eb24b818b427b5137397b091dcc07 SHA256 832cfffff5d1cb26cf3f2618014e8e1ff4d30153f34abda8db074788abef7dac
+MD5 13a8dfda02d8f0d1db1a982cd9950e7f files/gdbm-1.8.3-compat-linking.patch 611
+RMD160 f144f776f38acb1ea046009b2de0376b5149edb9 files/gdbm-1.8.3-compat-linking.patch 611
+SHA256 832cfffff5d1cb26cf3f2618014e8e1ff4d30153f34abda8db074788abef7dac files/gdbm-1.8.3-compat-linking.patch 611
AUX gdbm-1.8.3-fix-install-ownership.patch 1567 RMD160 e058ffe36f57dd421ac70bdbb4ed64cd1e641aa6 SHA1 efdbd776a434ccfd885e2f505e8cb2f8e54f5887 SHA256 e08df8b252176475c47615fbe87e554fc7391b29192131aba03e91f687a8076c
MD5 9ed34cb95efec19c95fbf28a2e7e0986 files/gdbm-1.8.3-fix-install-ownership.patch 1567
RMD160 e058ffe36f57dd421ac70bdbb4ed64cd1e641aa6 files/gdbm-1.8.3-fix-install-ownership.patch 1567
@@ -28,7 +28,7 @@ SHA256 ed3955b7dd86a349fb2e9d9a0f7c88ff1983f693a675d853f4c5591ee43e78f1 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.2 (GNU/Linux)
-iD8DBQFFxoMR8bi6rjpTunYRApu/AKDBuiEACWmTWZsx1UKLBSu5p7J2XgCfZAkT
-Uhugp/v1qn9DYa+r41JFLOQ=
-=rg7+
+iD8DBQFFyVMG8bi6rjpTunYRAgQvAJ0UhWTGpKX7jIgo4Bl1FJ8TztJlawCeJnJZ
+TnKwwSOsOIqKBN7rW3sloiY=
+=UYct
-----END PGP SIGNATURE-----
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