Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Jan 2020 20:18:34 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r523687 - in branches/2020Q1/www/trafficserver: . files
Message-ID:  <202001202018.00KKIYKo002745@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Mon Jan 20 20:18:34 2020
New Revision: 523687
URL: https://svnweb.freebsd.org/changeset/ports/523687

Log:
  MFH: r523686
  
  www/trafficserver: fix build on powerpc64
  
  This port builds on amd64, but without luajit support since there's no luajit for powerpc64.
  
  Also add USES=localbase instead of LIBS+= and remove unused CONFIGURE_ARGS.
  
  Since files are installed to powerpc-freebsd-thread-multi directory, set proper PLIST_SUB and do-install target.
  
  Don't add -L/usr/lib to LDFLAGS, it breaks when compiling with ports GCC.
  
  PR:		243154
  Approved by:	gaod@hychen.org (maintainer)
  Approved by:	portmgr (fix build blanket)

Added:
  branches/2020Q1/www/trafficserver/files/patch-configure
     - copied unchanged from r523686, head/www/trafficserver/files/patch-configure
Modified:
  branches/2020Q1/www/trafficserver/Makefile
  branches/2020Q1/www/trafficserver/pkg-plist
Directory Properties:
  branches/2020Q1/   (props changed)

Modified: branches/2020Q1/www/trafficserver/Makefile
==============================================================================
--- branches/2020Q1/www/trafficserver/Makefile	Mon Jan 20 20:17:40 2020	(r523686)
+++ branches/2020Q1/www/trafficserver/Makefile	Mon Jan 20 20:18:34 2020	(r523687)
@@ -12,17 +12,18 @@ COMMENT=	Fast, scalable and extensible HTTP proxy serv
 
 LICENSE=	APACHE20
 
-ONLY_FOR_ARCHS=	amd64
+ONLY_FOR_ARCHS=	amd64 powerpc64
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libhwloc.so:devel/hwloc \
-		libluajit-5.1.so:lang/luajit \
 		libpcre.so:devel/pcre \
 		libxml2.so:textproc/libxml2 \
-		libbrotlienc.so:archivers/brotli
+		libbrotlienc.so:archivers/brotli \
+		${LIB_DEPENDS_${ARCH}}
+LIB_DEPENDS_amd64=	libluajit-5.1.so:lang/luajit
 
-USES=		compiler:c++17-lang cpe gmake libtool ncurses pathfix \
-		perl5 pkgconfig sqlite ssl tar:bzip2 tcl
+USES=		compiler:c++17-lang cpe gmake libtool localbase ncurses \
+		pathfix perl5 pkgconfig sqlite ssl tar:bzip2 tcl
 
 CPE_VENDOR=	apache
 CPE_PRODUCT=	traffic_server
@@ -38,11 +39,8 @@ USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
 PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" PORTVERSION="${PORTVERSION}"
 
-LIBS+=		-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-libxml2=${LOCALBASE} \
-		--with-pcre=${LOCALBASE} \
+CONFIGURE_ARGS=	--with-pcre=${LOCALBASE} \
 		--with-openssl=${OPENSSLBASE} \
-		--with-xml=libxml2 \
 		--with-tcl=${TCL_LIBDIR} \
 		--localstatedir=/var \
 		--with-user=${USERS} \
@@ -54,6 +52,7 @@ CONFIGURE_ARGS=	--with-libxml2=${LOCALBASE} \
 
 OPTIONS_DEFINE=	DOCS WCCP MEMCACHED IMAGEMAGICK X11
 OPTIONS_SUB=	yes
+PLIST_SUB+=	ARCH="${ARCH:S/powerpc64/powerpc/}"
 
 WCCP_DESC=	Enable WCCPv2 protocol
 WCCP_CONFIGURE_ENABLE=	wccp
@@ -64,6 +63,12 @@ IMAGEMAGICK_DESC=	Enable ats-magick & webp convert plu
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == amd64
+PLIST_SUB+=	LUAJIT=""
+.else
+PLIST_SUB+=	LUAJIT="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MMEMCACHED}
 LIB_DEPENDS+=	libmemcached.so:databases/libmemcached
 PLIST_SUB+=	MEMCACHED=""
@@ -102,6 +107,6 @@ post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots
 	(cd ${STAGEDIR}${ETCDIR} && for f in *.config *.yaml; do ${MV} $$f $$f.sample; done)
 	${SED} -i '' -e 's|^${STAGEDIR}||g' \
-		${STAGEDIR}${PREFIX}/lib/perl5/amd64-freebsd-thread-multi/auto/Apache/TS/.packlist
+		${STAGEDIR}${PREFIX}/lib/perl5/${ARCH:S/powerpc64/powerpc/}-freebsd-thread-multi/auto/Apache/TS/.packlist
 
 .include <bsd.port.post.mk>

Copied: branches/2020Q1/www/trafficserver/files/patch-configure (from r523686, head/www/trafficserver/files/patch-configure)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q1/www/trafficserver/files/patch-configure	Mon Jan 20 20:18:34 2020	(r523687, copy of r523686, head/www/trafficserver/files/patch-configure)
@@ -0,0 +1,13 @@
+--- configure.orig	2020-01-03 10:44:56 UTC
++++ configure
+@@ -23922,7 +23922,9 @@ $as_echo "$as_me: adding ${ssldir}/lib64 to RPATH" >&6
+ 
+                   fi
+                 else
+-                  OPENSSL_LDFLAGS="-L$ssldir/lib"
++		  if [ $ssldir != "/usr" ]; then
++                  	OPENSSL_LDFLAGS="-L$ssldir/lib"
++		  fi
+                   if test "$overriden_with_ssl"; then
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: adding ${ssldir}/lib to RPATH" >&5

Modified: branches/2020Q1/www/trafficserver/pkg-plist
==============================================================================
--- branches/2020Q1/www/trafficserver/pkg-plist	Mon Jan 20 20:17:40 2020	(r523686)
+++ branches/2020Q1/www/trafficserver/pkg-plist	Mon Jan 20 20:18:34 2020	(r523687)
@@ -156,12 +156,12 @@ libexec/trafficserver/tcpinfo.so
 libexec/trafficserver/test_cppapi.so
 libexec/trafficserver/tls_bridge.so
 libexec/trafficserver/traffic_dump.so
-libexec/trafficserver/tslua.so
+%%LUAJIT%%libexec/trafficserver/tslua.so
 libexec/trafficserver/tsmemcache.so
 libexec/trafficserver/url_sig.so
 libexec/trafficserver/xdebug.so
-lib/perl5/amd64-freebsd-thread-multi/auto/Apache/TS/.packlist
-lib/perl5/amd64-freebsd-thread-multi/perllocal.pod
+lib/perl5/%%ARCH%%-freebsd-thread-multi/auto/Apache/TS/.packlist
+lib/perl5/%%ARCH%%-freebsd-thread-multi/perllocal.pod
 lib/perl5/Apache/TS.pm
 lib/perl5/Apache/TS/AdminClient.pm
 lib/perl5/Apache/TS/Config.pm



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