From cd9ec0ed5640e05a515e3f68cad24e9dad23c3c7 Mon Sep 17 00:00:00 2001 From: Jason Zaman Date: Sat, 19 Aug 2017 14:59:36 +0800 Subject: net-p2p/rtorrent: fix building against cppunit (bug 620908) Thanks to Nado and Ben Kohler Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- .../files/rtorrent-0.9.6-cppunit-pkgconfig.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch (limited to 'net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch') diff --git a/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch b/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch new file mode 100644 index 000000000000..753f4cb8a7f3 --- /dev/null +++ b/net-p2p/rtorrent/files/rtorrent-0.9.6-cppunit-pkgconfig.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/620908 + +diff -ur a/configure.ac b/configure.ac +--- a/configure.ac 2017-08-17 08:52:49.596897308 -0500 ++++ b/configure.ac 2017-08-17 08:54:57.171515415 -0500 +@@ -4,7 +4,6 @@ + + AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS(config.h) +-AM_PATH_CPPUNIT(1.9.6) + + AC_PROG_CXX + AC_PROG_LIBTOOL +@@ -43,9 +42,11 @@ + fi]) + ]) + +-CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" +-CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" +-LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $LIBS" ++PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"]) ++ ++CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CURSES_CFLAGS" ++CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CURSES_CFLAGS" ++LIBS="$PTHREAD_LIBS $CURSES_LIB $CURSES_LIBS $CPPUNIT_LIBS $LIBS" + + PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4, + CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS"; -- cgit v1.2.3-65-gdbad