diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-12-17 10:38:18 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-12-17 10:38:18 +0000 |
| commit | 2ae47a6af9b9c5d20cbdf5df9705efbb743f7710 (patch) | |
| tree | b19e7a8a8d3ab6f459bb8bb446048332f298af11 | |
| parent | f91cc8ec3b5f8608c1968e543d249daf20f0be56 (diff) | |
| download | ports-2ae47a6af9b9c5d20cbdf5df9705efbb743f7710.tar.gz ports-2ae47a6af9b9c5d20cbdf5df9705efbb743f7710.zip | |
MFH: r403901
- Fix build with TCMALLOC and STATIC_TOR
PR: 204739
Submitted by: amdmi3
Approved by: portmgr blanket
Approved by: ports-secteam blanket
Notes
Notes:
svn path=/branches/2015Q4/; revision=403902
| -rw-r--r-- | security/tor-devel/Makefile | 13 | ||||
| -rw-r--r-- | security/tor/Makefile | 13 |
2 files changed, 20 insertions, 6 deletions
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index b025c1897721..5446d9f1650d 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -87,7 +87,7 @@ TOR_LIBEVENT_LIBS:= -levent_openssl ${TOR_LIBEVENT_LIBS} .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@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \ - -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \ + @${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \ + ${WRKSRC}/configure + +post-patch-STATIC_TOR-off: + @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \ + ${WRKSRC}/configure + +post-patch-STATIC_TOR-on: + @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \ ${WRKSRC}/configure post-configure: diff --git a/security/tor/Makefile b/security/tor/Makefile index 6b0a76a476a7..9ebed5381564 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -84,7 +84,7 @@ TOR_LIBEVENT_LIBS:= -levent_openssl ${TOR_LIBEVENT_LIBS} .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@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \ - -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \ + @${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \ + ${WRKSRC}/configure + +post-patch-STATIC_TOR-off: + @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \ + ${WRKSRC}/configure + +post-patch-STATIC_TOR-on: + @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \ ${WRKSRC}/configure post-configure: |