Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 May 2019 07:20:43 +0000 (UTC)
From:      =?UTF-8?Q?Vin=c3=adcius_Zavam?= <egypcio@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r502316 - in head/net/measurement-kit: . files
Message-ID:  <201905230720.x4N7KhRY010748@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: egypcio
Date: Thu May 23 07:20:43 2019
New Revision: 502316
URL: https://svnweb.freebsd.org/changeset/ports/502316

Log:
  net/measurement-kit: fix build with GCC-based architectures
  
  PR:		237929
  Reported by:	pkubaj
  Approved by:	mentors (implicit)

Added:
  head/net/measurement-kit/files/
  head/net/measurement-kit/files/patch-m4_mk.m4   (contents, props changed)
Modified:
  head/net/measurement-kit/Makefile

Modified: head/net/measurement-kit/Makefile
==============================================================================
--- head/net/measurement-kit/Makefile	Thu May 23 07:05:41 2019	(r502315)
+++ head/net/measurement-kit/Makefile	Thu May 23 07:20:43 2019	(r502316)
@@ -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

Added: head/net/measurement-kit/files/patch-m4_mk.m4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/measurement-kit/files/patch-m4_mk.m4	Thu May 23 07:20:43 2019	(r502316)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905230720.x4N7KhRY010748>