Date: Tue, 18 Jul 2017 20:20:43 +0000 (UTC) From: Renato Botelho <garga@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446176 - in head/net: haproxy haproxy-devel Message-ID: <201707182020.v6IKKhZT028394@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: garga Date: Tue Jul 18 20:20:43 2017 New Revision: 446176 URL: https://svnweb.freebsd.org/changeset/ports/446176 Log: Fix net/haproxy and net/haproxy-devel build on ARM USE_REGPARM=1 is specific for amd64 and i386. Conditionalize its definition and let the port build on ARM Approved by: demon (maintainer) Obtained from: pfSense MFH: 2017Q3 Sponsored by: Rubicon Communications, LLC (Netgate) Differential Revision: https://reviews.freebsd.org/D11637 Modified: head/net/haproxy-devel/Makefile head/net/haproxy/Makefile Modified: head/net/haproxy-devel/Makefile ============================================================================== --- head/net/haproxy-devel/Makefile Tue Jul 18 20:20:41 2017 (r446175) +++ head/net/haproxy-devel/Makefile Tue Jul 18 20:20:43 2017 (r446176) @@ -24,7 +24,7 @@ DEVICEATLAS_DISTFILE= deviceatlas-enterprise-c-${DEVIC DEVICEATLAS_REGISTRATION_URL= https://deviceatlas.com/deviceatlas-haproxy-module MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ - USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_REGPARM=1 USE_ACCEPT4=1 \ + USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \ CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}" OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS @@ -82,4 +82,10 @@ do-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${ARCH} == "amd64" || ${ARCH} == "i386" +MAKE_ARGS+= USE_REGPARM=1 +.endif + +.include <bsd.port.post.mk> Modified: head/net/haproxy/Makefile ============================================================================== --- head/net/haproxy/Makefile Tue Jul 18 20:20:41 2017 (r446175) +++ head/net/haproxy/Makefile Tue Jul 18 20:20:43 2017 (r446176) @@ -23,7 +23,7 @@ DEVICEATLAS_DISTFILE= deviceatlas-enterprise-c-${DEVIC DEVICEATLAS_REGISTRATION_URL= https://deviceatlas.com/deviceatlas-haproxy-module MAKE_ARGS= TARGET=freebsd DEFINE=-DFREEBSD_PORTS USE_GETADDRINFO=1 \ - USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_REGPARM=1 USE_ACCEPT4=1 \ + USE_ZLIB=1 USE_CPU_AFFINITY=1 USE_ACCEPT4=1 \ CC="${CC}" DEBUG_CFLAGS="" CPU_CFLAGS="${CFLAGS}" OPTIONS_DEFINE= DOCS EXAMPLES LUA OPENSSL DEVICEATLAS @@ -82,6 +82,10 @@ do-install: (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}) .include <bsd.port.pre.mk> + +.if ${ARCH} == "amd64" || ${ARCH} == "i386" +MAKE_ARGS+= USE_REGPARM=1 +.endif .if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel} BROKEN= Does not build with openssl-devel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707182020.v6IKKhZT028394>