diff options
| author | xsmile | 2018-02-06 20:56:58 +0100 |
|---|---|---|
| committer | xsmile | 2018-02-06 20:56:58 +0100 |
| commit | 2dc12354ffe0f0bfabb7bcdae9480109ce7d2b34 (patch) | |
| tree | 7e42d41663e1167c2f216480fd653b43392813c7 /rt-base-cppunit-pkgconfig.patch | |
| parent | 0078dc7d12680689003e566d672b700390f16587 (diff) | |
| download | aur-2dc12354ffe0f0bfabb7bcdae9480109ce7d2b34.tar.gz | |
update patches
Diffstat (limited to 'rt-base-cppunit-pkgconfig.patch')
| -rw-r--r-- | rt-base-cppunit-pkgconfig.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/rt-base-cppunit-pkgconfig.patch b/rt-base-cppunit-pkgconfig.patch new file mode 100644 index 000000000000..f23c5e0ada79 --- /dev/null +++ b/rt-base-cppunit-pkgconfig.patch @@ -0,0 +1,32 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -4,7 +4,6 @@ + AC_DEFINE(API_VERSION, 9, api version) + AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS(config.h) +-AM_PATH_CPPUNIT(1.9.6) + + AC_PROG_CXX + AC_PROG_LIBTOOL +@@ -38,15 +38,11 @@ + fi + +-CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" +-CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CURSES_CFLAGS" +-LIBS="$PTHREAD_LIBS $CURSES_LIB $LIBS" ++PKG_CHECK_MODULES([LIBCURL], [libcurl], , [LIBCURL_CHECK_CONFIG]) ++PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"]) ++PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.13.6]) + +-PKG_CHECK_MODULES([libcurl], libcurl >= 7.15.4, +- CXXFLAGS="$CXXFLAGS $libcurl_CFLAGS"; +- LIBS="$LIBS $libcurl_LIBS") +- +-PKG_CHECK_MODULES([libtorrent], libtorrent >= 0.13.6, +- CXXFLAGS="$CXXFLAGS $libtorrent_CFLAGS"; +- LIBS="$LIBS $libtorrent_LIBS") ++LIBS="$PTHREAD_LIBS $CURSES_LIB $CPPUNIT_LIBS $LIBCURL $LIBCURL_LIBS $DEPENDENCIES_LIBS $LIBS" ++CFLAGS="$CFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS" ++CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS $CPPUNIT_CFLAGS $LIBCURL_CPPFLAGS $LIBCURL_CFLAGS $DEPENDENCIES_CFLAGS $CURSES_CFLAGS" + + AC_LANG_PUSH(C++) |