From b70981b68efcce5256eb11c6cd26ae123b10b6ea Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 24 Jul 2009 08:01:31 +0000 Subject: moved extra/* to main/ and fixed misc build issues --- .../gdbm/10-gdbm-1.8.3-fix-install-ownership.patch | 45 ++++++++++++++++++++++ main/gdbm/20-gdbm-1.8.3-compat-linking.patch | 19 +++++++++ main/gdbm/30-gdbm-1.8.3-build.patch | 21 ++++++++++ main/gdbm/APKBUILD | 40 +++++++++++++++++++ 4 files changed, 125 insertions(+) create mode 100644 main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch create mode 100644 main/gdbm/20-gdbm-1.8.3-compat-linking.patch create mode 100644 main/gdbm/30-gdbm-1.8.3-build.patch create mode 100644 main/gdbm/APKBUILD (limited to 'main/gdbm') diff --git a/main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch b/main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch new file mode 100644 index 0000000000..139ef99d7e --- /dev/null +++ b/main/gdbm/10-gdbm-1.8.3-fix-install-ownership.patch @@ -0,0 +1,45 @@ +Install with proper ownership. + +http://bugs.gentoo.org/24178 + +--- Makefile.in ++++ Makefile.in +@@ -14,10 +14,6 @@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ + +-# File ownership and group +-BINOWN = bin +-BINGRP = bin +- + MAKEINFO = makeinfo + TEXI2DVI = texi2dvi + +@@ -131,22 +127,17 @@ + $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ + $(INSTALL_ROOT)$(infodir) + $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ +- $(INSTALL_ROOT)$(includedir)/gdbm.h +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ +- $(INSTALL_ROOT)$(man3dir)/gdbm.3 +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.info \ +- $(INSTALL_ROOT)$(infodir)/gdbm.info ++ $(INSTALL_DATA) gdbm.h $(INSTALL_ROOT)$(includedir)/gdbm.h ++ $(INSTALL_DATA) $(srcdir)/gdbm.3 $(INSTALL_ROOT)$(man3dir)/gdbm.3 ++ $(INSTALL_DATA) $(srcdir)/gdbm.info $(INSTALL_ROOT)$(infodir)/gdbm.info + + install-compat: + $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ + $(INSTALL_ROOT)$(includedir) + $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ + $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ +- $(INSTALL_ROOT)$(includedir)/dbm.h +- $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/ndbm.h \ +- $(INSTALL_ROOT)$(includedir)/ndbm.h ++ $(INSTALL_DATA) $(srcdir)/dbm.h $(INSTALL_ROOT)$(includedir)/dbm.h ++ $(INSTALL_DATA) $(srcdir)/ndbm.h $(INSTALL_ROOT)$(includedir)/ndbm.h + + #libgdbm.a: $(OBJS) gdbm.h + # rm -f libgdbm.a diff --git a/main/gdbm/20-gdbm-1.8.3-compat-linking.patch b/main/gdbm/20-gdbm-1.8.3-compat-linking.patch new file mode 100644 index 0000000000..1337d08f5b --- /dev/null +++ b/main/gdbm/20-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 + +--- Makefile.in ++++ 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 diff --git a/main/gdbm/30-gdbm-1.8.3-build.patch b/main/gdbm/30-gdbm-1.8.3-build.patch new file mode 100644 index 0000000000..084f5a1d24 --- /dev/null +++ b/main/gdbm/30-gdbm-1.8.3-build.patch @@ -0,0 +1,21 @@ +Respect system LDFLAGS when generating gdbm libs + +http://bugs.gentoo.org/209730 + +--- Makefile.in ++++ Makefile.in +@@ -146,12 +146,12 @@ + + libgdbm.la: $(LOBJS) gdbm.h + rm -f libgdbm.la +- $(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \ ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm.la -rpath $(libdir) \ + -version-info $(SHLIB_VER) $(LOBJS) + + libgdbm_compat.la: $(C_LOBJS) gdbm.h libgdbm.la + rm -f libgdbm_compat.la +- $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \ ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm_compat.la -rpath $(libdir) \ + -version-info $(SHLIB_VER) $(C_LOBJS) libgdbm.la + + gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2 diff --git a/main/gdbm/APKBUILD b/main/gdbm/APKBUILD new file mode 100644 index 0000000000..e20966b323 --- /dev/null +++ b/main/gdbm/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Carlo Landmeter +# Maintainer: Carlo Landmeter +pkgname=gdbm +pkgver=1.8.3 +pkgrel=0 +pkgdesc="GNU dbm is a set of database routines that use extensible hashing" +url="http://www.gnu.org/software/gdbm/" +license="GPL" +depends="uclibc" +makedepends="" +install= +subpackages="$pkgname-dev $pkgname-dev" +source="ftp://ftp.nluug.nl/pub/gnu/gdbm/gdbm-1.8.3.tar.gz +30-gdbm-1.8.3-build.patch +20-gdbm-1.8.3-compat-linking.patch +10-gdbm-1.8.3-fix-install-ownership.patch" + +build() { + cd "$srcdir/$pkgname-$pkgver" + + for i in ../*.patch; do + msg "Applying $i" + patch -p0 < $i || return 1 + done + + ./configure --prefix=/usr \ + --includedir=/usr/include/gdbm \ + --disable-dependency-tracking \ + --enable-fast-install + make || return 1 + make INSTALL_ROOT="$pkgdir" install || return 1 + make INSTALL_ROOT="$pkgdir" install-compat || return 1 + mv "${pkgdir}"/usr/include/gdbm/gdbm.h "${pkgdir}"/usr/include/ + +} + +md5sums="1d1b1d5c0245b1c00aff92da751e9aa1 gdbm-1.8.3.tar.gz +5e76bc4f51640434e4279e940f6c73fb 30-gdbm-1.8.3-build.patch +c8e2323a9e075d5c947cb7c7aeae5384 20-gdbm-1.8.3-compat-linking.patch +4c7b88079898d7cb380e95c8ae99a9f9 10-gdbm-1.8.3-fix-install-ownership.patch" -- cgit v1.2.3