diff options
| author | Juergen Daubert <jue@jue.li> | 2010-06-03 10:36:38 +0000 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2010-06-03 10:36:38 +0000 |
| commit | a5cf37f1f4d90364ae61a2c1d0e3e758c8bfc887 (patch) | |
| tree | 0f2fa528208ff2273986e38e172103f0ccba1abf | |
| parent | 8ce96ebbe74e582c0bfe18092d6c1e10a47b7f97 (diff) | |
| download | core-a5cf37f1f4d90364ae61a2c1d0e3e758c8bfc887.tar.gz core-a5cf37f1f4d90364ae61a2c1d0e3e758c8bfc887.tar.xz | |
gdbm: fix linking of gdbm_compat
| -rw-r--r-- | gdbm/.footprint | 8 | ||||
| -rw-r--r-- | gdbm/.md5sum | 1 | ||||
| -rw-r--r-- | gdbm/Pkgfile | 21 | ||||
| -rw-r--r-- | gdbm/gdbm-1.8.3-compat-linking.patch | 19 |
4 files changed, 39 insertions, 10 deletions
diff --git a/gdbm/.footprint b/gdbm/.footprint index 6fc3fded..31f481dd 100644 --- a/gdbm/.footprint +++ b/gdbm/.footprint @@ -1,8 +1,10 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/include/ --rw-r--r-- root/root usr/include/dbm.h --rw-r--r-- root/root usr/include/gdbm.h --rw-r--r-- root/root usr/include/ndbm.h +lrwxrwxrwx root/root usr/include/gdbm.h -> gdbm/gdbm.h +drwxr-xr-x root/root usr/include/gdbm/ +-rw-r--r-- root/root usr/include/gdbm/dbm.h +-rw-r--r-- root/root usr/include/gdbm/gdbm.h +-rw-r--r-- root/root usr/include/gdbm/ndbm.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libgdbm.a -rwxr-xr-x root/root usr/lib/libgdbm.la diff --git a/gdbm/.md5sum b/gdbm/.md5sum index b5d59860..d5465f46 100644 --- a/gdbm/.md5sum +++ b/gdbm/.md5sum @@ -1 +1,2 @@ +13a8dfda02d8f0d1db1a982cd9950e7f gdbm-1.8.3-compat-linking.patch 1d1b1d5c0245b1c00aff92da751e9aa1 gdbm-1.8.3.tar.gz diff --git a/gdbm/Pkgfile b/gdbm/Pkgfile index 1b9019e4..e510d80b 100644 --- a/gdbm/Pkgfile +++ b/gdbm/Pkgfile @@ -4,15 +4,22 @@ name=gdbm version=1.8.3 -release=1 -source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz) +release=2 +source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz + $name-$version-compat-linking.patch) build() { cd $name-$version - ./configure --prefix=/usr - make prefix=/usr - make prefix=$PKG/usr install - make prefix=$PKG/usr install-compat - rm -rf $PKG/usr/info + + patch -p1 -i $SRC/$name-$version-compat-linking.patch + + ./configure --prefix=/usr \ + --includedir=/usr/include/gdbm + + make + make -j1 INSTALL_ROOT=$PKG install install-compat + ln -sf gdbm/gdbm.h $PKG/usr/include/gdbm.h + + rm -r $PKG/usr/info chown -R root.root $PKG } diff --git a/gdbm/gdbm-1.8.3-compat-linking.patch b/gdbm/gdbm-1.8.3-compat-linking.patch new file mode 100644 index 00000000..cebcf4e9 --- /dev/null +++ b/gdbm/gdbm-1.8.3-compat-linking.patch @@ -0,0 +1,19 @@ +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,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) libgdbm.la + + gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 + rm -f gdbm.h |