FreeBSD Bugzilla – Attachment 147821 Details for
Bug 194029
net-p2p/transmission-cli: don't use bundled libraries
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
use system libs
transmission.system-libs.diff (text/plain), 1.73 KB, created by
Jan Beich
on 2014-09-30 07:59:20 UTC
(
hide
)
Description:
use system libs
Filename:
MIME Type:
Creator:
Jan Beich
Created:
2014-09-30 07:59:20 UTC
Size:
1.73 KB
patch
obsolete
>Index: net-p2p/transmission-cli/Makefile >=================================================================== >--- net-p2p/transmission-cli/Makefile (revision 369573) >+++ net-p2p/transmission-cli/Makefile (working copy) >@@ -34,6 +34,10 @@ LIB_DEPENDS?= ${GEN_LIB_DEPENDS} > > # General dependencies > GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \ >+ libdht.so:${PORTSDIR}/devel/jech-dht \ >+ libminiupnpc.so:${PORTSDIR}/net/miniupnpc \ >+ libnatpmp.so:${PORTSDIR}/net/libnatpmp \ >+ libutp.so:${PORTSDIR}/net/libutp \ > libevent.so:${PORTSDIR}/devel/libevent2 > GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web > >@@ -41,12 +45,21 @@ GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/we > USES+= gmake iconv libtool pkgconfig > USE_OPENSSL= yes > GNU_CONFIGURE= yes >-CPPFLAGS+= -I${LOCALBASE}/include >-LIBS+= -L${LOCALBASE}/lib ${ICONV_LIB} >+CPPFLAGS+= -I${LOCALBASE}/include -DWITH_UTP=1 >+LDFLAGS+= -L${LOCALBASE}/lib >+LIBS+= ${ICONV_LIB} > CONFIGURE_ARGS=--with-zlib=/usr \ >+ --disable-utp \ >+ --enable-external-natpmp \ > ${EXTRA_CONF_ARGS} > CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ >- OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" >+ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \ >+ DHT_CFLAGS=" " \ >+ DHT_LIBS="-ldht" \ >+ LIBUTP_CFLAGS=" " \ >+ LIBUTP_LIBS="-lutp" \ >+ LIBUTP_LIBS_QT="-lutp" >+ > EXTRA_CONF_ARGS?=--enable-cli \ > --disable-daemon \ > --without-gtk \ >@@ -82,6 +95,11 @@ general-patch: > @${REINPLACE_CMD} -e 's|utils \\|\\|g' \ > ${WRKSRC}/Makefile.in > .endif >+# Don't conflict with patches but force system libraries >+ @${REINPLACE_CMD} -e 's|third-party \\|\\|g' \ >+ ${WRKSRC}/Makefile.in >+ @${REINPLACE_CMD} -Ee '/^DHT_(CFLAGS|LIBS)=/d' \ >+ ${WRKSRC}/configure > > post-patch: general-patch >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 194029
:
147821
|
147822
|
147837
|
147838
|
147840
|
147841
|
147842
|
147843
|
147849
|
147867
|
151021