svn commit: r403901 - in head/security: tor tor-devel

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Dec 17 10:36:53 2015
New Revision: 403901
URL: https://svnweb.freebsd.org/changeset/ports/403901

Log:
  - Fix build with TCMALLOC and STATIC_TOR
  
  PR:		204739
  Submitted by:	amdmi3
  Approved by:	portmgr blanket
  MFH:		2015Q4 (blanket)

Modified:
  head/security/tor-devel/Makefile
  head/security/tor/Makefile

Modified: head/security/tor-devel/Makefile
==============================================================================
--- head/security/tor-devel/Makefile	Thu Dec 17 10:36:10 2015	(r403900)
+++ head/security/tor-devel/Makefile	Thu Dec 17 10:36:53 2015	(r403901)
@@ -86,7 +86,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
@@ -103,8 +103,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: head/security/tor/Makefile
==============================================================================
--- head/security/tor/Makefile	Thu Dec 17 10:36:10 2015	(r403900)
+++ head/security/tor/Makefile	Thu Dec 17 10:36:53 2015	(r403901)
@@ -83,7 +83,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
@@ -100,8 +100,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: