diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2015-12-17 18:36:53 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2015-12-17 18:36:53 +0800 |
| commit | 2d0c31f3c78f9657754234cea5d6d983f18f0de3 (patch) | |
| tree | 71be8ce68cb0d517488211c888f769beb0c62109 /security | |
| parent | 936f140d14c50dcf6183dfb023d36b3db78a9a3c (diff) | |
| download | freebsd-ports-gnome-2d0c31f3c78f9657754234cea5d6d983f18f0de3.tar.gz freebsd-ports-gnome-2d0c31f3c78f9657754234cea5d6d983f18f0de3.tar.zst freebsd-ports-gnome-2d0c31f3c78f9657754234cea5d6d983f18f0de3.zip | |
- Fix build with TCMALLOC and STATIC_TOR
PR: 204739
Submitted by: amdmi3
Approved by: portmgr blanket
MFH: 2015Q4 (blanket)
Diffstat (limited to 'security')
| -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 2348f87f9b5f..c02851d8b8cb 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -86,7 +86,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 @@ -103,8 +103,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 45fe7f310e57..ffca68ed1560 100644 --- a/security/tor/Makefile +++ b/security/tor/Makefile @@ -83,7 +83,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 @@ -100,8 +100,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: |