aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/measurement-kit/Makefile2
-rw-r--r--net/measurement-kit/files/patch-m4_mk.m415
2 files changed, 17 insertions, 0 deletions
diff --git a/net/measurement-kit/Makefile b/net/measurement-kit/Makefile
index d9e55adfc05a..cdf9255cd568 100644
--- a/net/measurement-kit/Makefile
+++ b/net/measurement-kit/Makefile
@@ -24,6 +24,8 @@ CONFIGURE_ARGS= --with-libcurl=${LOCALBASE} \
--with-libevent=${LOCALBASE} \
--with-libmaxminddb=${LOCALBASE} \
--with-openssl=${OPENSSLBASE}
+CONFIGURE_ENV= CC=${CC} \
+ CXX=${CXX}
INSTALL_TARGET= install-strip
PORTDOCS= README.md include/README.md
diff --git a/net/measurement-kit/files/patch-m4_mk.m4 b/net/measurement-kit/files/patch-m4_mk.m4
new file mode 100644
index 000000000000..3374b546c2b5
--- /dev/null
+++ b/net/measurement-kit/files/patch-m4_mk.m4
@@ -0,0 +1,15 @@
+--- m4/mk.m4.orig 2019-05-16 20:09:11 UTC
++++ m4/mk.m4
+@@ -90,8 +90,10 @@ AC_DEFUN([MK_AM_OPENSSL], [
+ [SSL toolkit @<:@default=check@:>@])
+ ],
+ [
+- CPPFLAGS="$CPPFLAGS -I$withval/include"
+- LDFLAGS="$LDFLAGS -L$withval/lib"
++ if test ${with_openssl} != /usr; then
++ CPPFLAGS="$CPPFLAGS -I$withval/include"
++ LDFLAGS="$LDFLAGS -L$withval/lib"
++ fi
+ ],
+ [
+ if test -d /usr/local/Cellar/openssl; then