From 1a5573d3767895d13781b3eb3381a5c2ca7ed2be Mon Sep 17 00:00:00 2001 From: jow Date: Sat, 11 Dec 2010 00:11:36 +0000 Subject: [PATCH] [packages] gdbm: allow autoreconf, fix shell git-svn-id: svn://svn.openwrt.org/openwrt/packages@24467 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/gdbm/Makefile | 2 +- .../patches/100-fix-build-with-libtool2.patch | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile index d9bc342f6..9d9c58cc0 100644 --- a/libs/gdbm/Makefile +++ b/libs/gdbm/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/gdbm PKG_MD5SUM:=1d1b1d5c0245b1c00aff92da751e9aa1 -PKG_FIXUP:=libtool no-autoreconf +PKG_FIXUP:=libtool PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/libs/gdbm/patches/100-fix-build-with-libtool2.patch b/libs/gdbm/patches/100-fix-build-with-libtool2.patch index b83cfd6d4..850197130 100644 --- a/libs/gdbm/patches/100-fix-build-with-libtool2.patch +++ b/libs/gdbm/patches/100-fix-build-with-libtool2.patch @@ -1,7 +1,15 @@ -diff -urN gdbm-1.8.3.ori/Makefile.in gdbm-1.8.3.new/Makefile.in ---- gdbm-1.8.3.ori/Makefile.in 2002-10-08 18:09:12.000000000 +0200 -+++ gdbm-1.8.3.new/Makefile.in 2009-04-29 10:14:48.000000000 +0200 -@@ -130,7 +130,7 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -55,7 +55,7 @@ manext = 3 + .c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) $(CFLAGS) $< + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm + +@@ -130,7 +130,7 @@ install: libgdbm.la gdbm.h gdbm.info $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ $(INSTALL_ROOT)$(infodir) @@ -10,7 +18,7 @@ diff -urN gdbm-1.8.3.ori/Makefile.in gdbm-1.8.3.new/Makefile.in $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ $(INSTALL_ROOT)$(includedir)/gdbm.h $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ -@@ -141,7 +141,7 @@ +@@ -141,7 +141,7 @@ install: libgdbm.la gdbm.h gdbm.info install-compat: $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ $(INSTALL_ROOT)$(includedir)