svn commit: r446292 - in branches/2017Q3/net: haproxy haproxy-devel
Renato Botelho
garga at FreeBSD.org
Thu Jul 20 20:40:38 UTC 2017
Author: garga
Date: Thu Jul 20 20:40:37 2017
New Revision: 446292
URL: https://svnweb.freebsd.org/changeset/ports/446292
Log:
MFH: r445240 r446176
Update to version 1.7.8.
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
Sponsored by: Rubicon Communications, LLC (Netgate)
Differential Revision: https://reviews.freebsd.org/D11637
Approved by: ports-secteam (junovitch)
Modified:
branches/2017Q3/net/haproxy-devel/Makefile
branches/2017Q3/net/haproxy/Makefile
branches/2017Q3/net/haproxy/distinfo
Directory Properties:
branches/2017Q3/ (props changed)
Modified: branches/2017Q3/net/haproxy-devel/Makefile
==============================================================================
--- branches/2017Q3/net/haproxy-devel/Makefile Thu Jul 20 20:33:11 2017 (r446291)
+++ branches/2017Q3/net/haproxy-devel/Makefile Thu Jul 20 20:40:37 2017 (r446292)
@@ -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: branches/2017Q3/net/haproxy/Makefile
==============================================================================
--- branches/2017Q3/net/haproxy/Makefile Thu Jul 20 20:33:11 2017 (r446291)
+++ branches/2017Q3/net/haproxy/Makefile Thu Jul 20 20:40:37 2017 (r446292)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= haproxy
-PORTVERSION= 1.7.7
+PORTVERSION= 1.7.8
CATEGORIES= net www
MASTER_SITES= http://www.haproxy.org/download/1.7/src/
DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
@@ -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
Modified: branches/2017Q3/net/haproxy/distinfo
==============================================================================
--- branches/2017Q3/net/haproxy/distinfo Thu Jul 20 20:33:11 2017 (r446291)
+++ branches/2017Q3/net/haproxy/distinfo Thu Jul 20 20:40:37 2017 (r446292)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1498460319
-SHA256 (haproxy-1.7.7.tar.gz) = 81196ca449e4ada45fbd743fe3804bb82c25563ff9653e136872181ee5603ae2
-SIZE (haproxy-1.7.7.tar.gz) = 1745024
+TIMESTAMP = 1499429680
+SHA256 (haproxy-1.7.8.tar.gz) = ec90153ccedd20ad4015d3eaf76b502ff1f61b431d54c22b8457b5784a9ae142
+SIZE (haproxy-1.7.8.tar.gz) = 1746321
SHA256 (deviceatlas-enterprise-c-2.1.2_1.tgz) = 984e1ae3147459a4ed0a8d5053d83dd05ce8c5127cd3cb055be35a74e9217372
SIZE (deviceatlas-enterprise-c-2.1.2_1.tgz) = 184432
More information about the svn-ports-all
mailing list