From a484edaf331bc12f48897f56e0b7749c838a3ccf Mon Sep 17 00:00:00 2001 From: Mahdi Mokhtari Date: Sat, 9 Feb 2019 13:36:06 +0000 Subject: [PATCH] www/mod_maxminddb: Fix dynamic link error with libmaxminddb.so The module wasn't linked correctly with libmaxminddb.so when using `AP_FAST_BUILD`, because of not having correct ld-flags. Switch to default build (with a patch) solves the problem. Reported by: ler Sponsored by: The FreeBSD Foundation --- www/mod_maxminddb/Makefile | 9 ++++++--- www/mod_maxminddb/files/patch-src_Makefile.am | 10 +++++++--- www/mod_maxminddb/pkg-plist | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 www/mod_maxminddb/pkg-plist diff --git a/www/mod_maxminddb/Makefile b/www/mod_maxminddb/Makefile index 7df45590b623..ebfceb117e6d 100644 --- a/www/mod_maxminddb/Makefile +++ b/www/mod_maxminddb/Makefile @@ -2,6 +2,7 @@ PORTNAME= mod_maxminddb PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} @@ -18,8 +19,10 @@ GNU_CONFIGURE= yes USE_GITHUB= yes GH_ACCOUNT= maxmind -AP_FAST_BUILD= yes -AP_GENPLIST= yes -SRC_FILE= src/${PORTNAME}.c +post-patch: + @${REINPLACE_CMD} -e 's|%%LIBEXECDEST%%|${STAGEDIR}${PREFIX}/${APACHEMODDIR}|g' ${WRKSRC}/src/Makefile.am + +pre-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .include diff --git a/www/mod_maxminddb/files/patch-src_Makefile.am b/www/mod_maxminddb/files/patch-src_Makefile.am index 86d9afdb954c..2c1fd67e675c 100644 --- a/www/mod_maxminddb/files/patch-src_Makefile.am +++ b/www/mod_maxminddb/files/patch-src_Makefile.am @@ -1,6 +1,6 @@ ---- src/Makefile.am.orig 2019-01-19 16:36:41 UTC +--- src/Makefile.am.orig 2016-10-19 20:07:32 UTC +++ src/Makefile.am -@@ -1,12 +1,13 @@ +@@ -1,15 +1,16 @@ AUTOMAKE_OPTIONS = foreign WC=-Wc,"$(CFLAGS)" +WL=-Wl,"$(LDFLAGS)" @@ -14,4 +14,8 @@ + $(APXS) -c $(WL) $(LIBMAXMINDDB_LDFLAGS) $(LIBS) $(WC) $(APXS_LDFLAGS) mod_maxminddb.c install-exec-local: module - $(APXS) -i -a -n maxminddb .libs/mod_maxminddb.so +- $(APXS) -i -a -n maxminddb .libs/mod_maxminddb.so ++ $(APXS) -S LIBEXECDIR=%%LIBEXECDEST%% -i -a -n maxminddb mod_maxminddb.la ### maxminddb .libs/mod_maxminddb.so + + CLEANFILES= *.la *.lo *.o *.so *.slo .libs/* + diff --git a/www/mod_maxminddb/pkg-plist b/www/mod_maxminddb/pkg-plist new file mode 100644 index 000000000000..6684a2a1701b --- /dev/null +++ b/www/mod_maxminddb/pkg-plist @@ -0,0 +1 @@ +%%APACHEMODDIR%%/%%AP_MODULE%%