Attachment #206608 for bug #232237

Lines 2-7 Link Here

(-)Makefile (+6 lines)
2		2
3	PORTNAME= libtorrent	3	PORTNAME= libtorrent
4	PORTVERSION= 0.13.8	4	PORTVERSION= 0.13.8
		5	PORTREVISION= 1
5	CATEGORIES= net-p2p	6	CATEGORIES= net-p2p
6	MASTER_SITES= https://rtorrent.net/downloads/	7	MASTER_SITES= https://rtorrent.net/downloads/
7		8
Lines 15-20 Link Here
15		16
16	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
17	CONFIGURE_ARGS= --disable-debug	18	CONFIGURE_ARGS= --disable-debug
		19
18	CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" OPENSSL_CFLAGS="-I\	20	CONFIGURE_ENV= OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" OPENSSL_CFLAGS="-I\
19	${OPENSSLINC}"	21	${OPENSSLINC}"
20	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
Lines 39-44 Link Here
39	CONFIGURE_ARGS+=--disable-instrumentation	41	CONFIGURE_ARGS+=--disable-instrumentation
40	.endif	42	.endif
41		43
		44	post-configure:
		45	${REINPLACE_CMD} 's\|PKG_CHECK_MODULES.*\|\|g' \
		46	configure.ac # cause of "autoreconf"
		47
42	post-install:	48	post-install:
43	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtorrent.so.21.0.0	49	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtorrent.so.21.0.0
44		50




--- configure.ac.orig	2019-08-16 02:21:39 UTC
+++ configure.ac
@@ -61,11 +61,9 @@ CC_ATTRIBUTE_VISIBILITY
 AX_PTHREAD
 AX_CHECK_ZLIB
 
-PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
-
-CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
-CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
-LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS"
+CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
+LIBS="$PTHREAD_LIBS $LIBS"
 
 AC_ARG_ENABLE(openssl,
   [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],

Return to bug 232237

Line 0 Link Here

(-)files/patch-configure.ac (+17 lines)
	1	--- configure.ac.orig 2019-08-16 02:21:39 UTC
	2	+++ configure.ac
	3	@@ -61,11 +61,9 @@ CC_ATTRIBUTE_VISIBILITY
	4	AX_PTHREAD
	5	AX_CHECK_ZLIB
	6
	7	-PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
	8	-
	9	-CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
	10	-CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
	11	-LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS"
	12	+CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
	13	+CXXFLAGS="$PTHREAD_CFLAGS $CXXFLAGS"
	14	+LIBS="$PTHREAD_LIBS $LIBS"
	15
	16	AC_ARG_ENABLE(openssl,
	17	[ --disable-openssl Don't use OpenSSL's SHA1 implementation.],