svn commit: r403902 - in branches/2015Q4/security: tor tor-devel

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Dec 17 10:38:18 2015
New Revision: 403902
URL: https://svnweb.freebsd.org/changeset/ports/403902

Log:
  MFH: r403901
  
  - Fix build with TCMALLOC and STATIC_TOR
  
  PR:		204739
  Submitted by:	amdmi3
  Approved by:	portmgr blanket
  Approved by:	ports-secteam blanket

Modified:
  branches/2015Q4/security/tor-devel/Makefile
  branches/2015Q4/security/tor/Makefile
Directory Properties:
  branches/2015Q4/   (props changed)

Modified: branches/2015Q4/security/tor-devel/Makefile
==============================================================================
--- branches/2015Q4/security/tor-devel/Makefile	Thu Dec 17 10:36:53 2015	(r403901)
+++ branches/2015Q4/security/tor-devel/Makefile	Thu Dec 17 10:38:18 2015	(r403902)
@@ -87,7 +87,7 @@ TOR_LIBEVENT_LIBS:=	-levent_openssl ${TO
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS +=	${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:${PORTSDIR}/devel/google-perftools
 .else
 LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
 .endif
@@ -104,8 +104,15 @@ CONFIGURE_ARGS+=	--disable-transparent
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -E -e "s at -ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
-		-e "s@(-z) (relro|now)@-Wl,\1,\2 at g" \
+	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2 at g" \
+		${WRKSRC}/configure
+
+post-patch-STATIC_TOR-off:
+	@${REINPLACE_CMD} -e "s at -ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
+		${WRKSRC}/configure
+
+post-patch-STATIC_TOR-on:
+	@${REINPLACE_CMD} -e "s at -ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \
 		${WRKSRC}/configure
 
 post-configure:

Modified: branches/2015Q4/security/tor/Makefile
==============================================================================
--- branches/2015Q4/security/tor/Makefile	Thu Dec 17 10:36:53 2015	(r403901)
+++ branches/2015Q4/security/tor/Makefile	Thu Dec 17 10:38:18 2015	(r403902)
@@ -84,7 +84,7 @@ TOR_LIBEVENT_LIBS:=	-levent_openssl ${TO
 .if ${PORT_OPTIONS:MTCMALLOC}
 CONFIGURE_ARGS+=	--with-tcmalloc
 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS +=	${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+BUILD_DEPENDS+=		${LOCALBASE}/lib/libtcmalloc.a:${PORTSDIR}/devel/google-perftools
 .else
 LIB_DEPENDS+=		libtcmalloc.so:${PORTSDIR}/devel/google-perftools
 .endif
@@ -101,8 +101,15 @@ CONFIGURE_ARGS+=	--disable-transparent
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -E -e "s at -ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
-		-e "s@(-z) (relro|now)@-Wl,\1,\2 at g" \
+	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2 at g" \
+		${WRKSRC}/configure
+
+post-patch-STATIC_TOR-off:
+	@${REINPLACE_CMD} -e "s at -ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
+		${WRKSRC}/configure
+
+post-patch-STATIC_TOR-on:
+	@${REINPLACE_CMD} -e "s at -ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \
 		${WRKSRC}/configure
 
 post-configure: