summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--patches/man-db-2.7.6.1.local.patch50
-rw-r--r--vars/build.vars3
2 files changed, 51 insertions, 2 deletions
diff --git a/patches/man-db-2.7.6.1.local.patch b/patches/man-db-2.7.6.1.local.patch
index f89dd4f3..8f762e78 100644
--- a/patches/man-db-2.7.6.1.local.patch
+++ b/patches/man-db-2.7.6.1.local.patch
@@ -1,5 +1,53 @@
+diff -ru man-db-2.7.5.orig/lib/Makefile.am man-db-2.7.5/lib/Makefile.am
+--- man-db-2.7.5.orig/lib/Makefile.am 2014-09-29 13:45:14.000000000 +0200
++++ man-db-2.7.5/lib/Makefile.am 2017-01-19 01:29:38.000000000 +0100
+@@ -60,7 +60,7 @@
+ xregcomp.h
+
+ libman_la_LIBADD = ../gnulib/lib/libgnu.la $(LTLIBOBJS) \
+- $(LIBCOMPRESS) @LTLIBINTL@
++ $(LIBCOMPRESS) -lpipeline @LTLIBINTL@
+
+ libman_la_LDFLAGS = \
+ -avoid-version -release $(VERSION) -rpath $(pkglibdir) \
+diff -ru man-db-2.7.5.orig/lib/Makefile.in man-db-2.7.5/lib/Makefile.in
+--- man-db-2.7.5.orig/lib/Makefile.in 2017-01-19 02:49:51.105766753 +0100
++++ man-db-2.7.5/lib/Makefile.in 2017-01-19 02:48:18.390682563 +0100
+@@ -1447,7 +1447,7 @@
+ xregcomp.h
+
+ libman_la_LIBADD = ../gnulib/lib/libgnu.la $(LTLIBOBJS) \
+- $(LIBCOMPRESS) @LTLIBINTL@
++ $(LIBCOMPRESS) -lpipeline @LTLIBINTL@
+
+ libman_la_LDFLAGS = \
+ -avoid-version -release $(VERSION) -rpath $(pkglibdir) \
+diff -ru man-db-2.7.5.orig/libdb/db_lookup.c man-db-2.7.5/libdb/db_lookup.c
+--- man-db-2.7.5.orig/libdb/db_lookup.c 2015-08-02 12:31:55.000000000 +0200
++++ man-db-2.7.5/libdb/db_lookup.c 2017-01-19 02:35:48.000000000 +0100
+@@ -50,6 +50,8 @@
+ #include "mydbm.h"
+ #include "db_storage.h"
+
++char *database;
++
+ /* If using ndbm or BTREE, copy the static storage before doing anything
+ * interesting with it. If using gdbm, firstkey and nextkey need to copy the
+ * storage because our ordered wrappers keep an effectively static copy.
+diff -ru man-db-2.7.5.orig/libdb/db_ver.c man-db-2.7.5/libdb/db_ver.c
+--- man-db-2.7.5.orig/libdb/db_ver.c 2015-04-08 11:23:25.000000000 +0200
++++ man-db-2.7.5/libdb/db_ver.c 2017-01-19 02:35:30.000000000 +0100
+@@ -37,6 +37,8 @@
+
+ #include "mydbm.h"
+
++char *database;
++
+ int dbver_rd (MYDBM_FILE dbfile)
+ {
+ datum key, content;
--- man-db-2.7.6.1/src/Makefile.in.orig 2016-12-12 13:43:52.000000000 +0100
-+++ man-db-2.7.6.1/src/Makefile.in 2016-12-14 16:08:20.231601400 +0100
++++ man-db-2.7.6.1/src/Makefile.in 2017-01-19 18:02:40.709802500 +0100
@@ -2210,11 +2210,6 @@
all-am: apropos$(EXEEXT)
diff --git a/vars/build.vars b/vars/build.vars
index 811b8288..8f7f524d 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -563,7 +563,8 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
: ${PKG_MAN_DB_SHA256SUM:=08edbc52f24aca3eebac429b5444efd48b9b90b9b84ca0ed5507e5c13ed10f3f};
: ${PKG_MAN_DB_VERSION:=2.7.6.1};
: ${PKG_MAN_DB_URL:=http://download.savannah.gnu.org/releases/man-db/man-db-${PKG_MAN_DB_VERSION}.tar.xz};
-: ${PKG_MAN_DB_SLIBTOOL:=slibtool-static};
+: ${PKG_MAN_DB_CFLAGS_BUILD_EXTRA:="-Dprogram_name=program_invocation_name -I${PREFIX_NATIVE}/include"};
+: ${PKG_MAN_DB_MAKEFLAGS_BUILD_EXTRA:=V=99};
: ${PKG_MC_SHA256SUM:=f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece};
: ${PKG_MC_VERSION:=4.8.18};
: ${PKG_MC_URL:=http://ftp.midnight-commander.org/mc-${PKG_MC_VERSION}.tar.xz};