From 8948adcee307cb79eb39894493ea4601ce8342b2 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Thu, 30 Apr 2020 08:34:38 +0200 Subject: [PATCH] qbittorent qbittorent Signed-off-by: Daniel Engberg --- net-p2p/libtorrent-rasterbar/Makefile | 4 ++-- .../files/patch-test_setup__transfer.cpp | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 net-p2p/libtorrent-rasterbar/files/patch-test_setup__transfer.cpp diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile index 31a9dcc22c72..454f6269b219 100644 --- a/net-p2p/libtorrent-rasterbar/Makefile +++ b/net-p2p/libtorrent-rasterbar/Makefile @@ -41,7 +41,7 @@ LOGGING_CMAKE_BOOL= logging .include -.if ${ARCH} != powerpc && ${ARCH} != powerpc64 +.if !${ARCH:Mpowerpc*} && ${OPSYS}_${OSREL:R} == FreeBSD_13 && ${OSVERSION} < 1300093 # workaroud for the clang-10 compiler failure: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244830 # on powerpc, llvm 9 crashes with segfault, while 10 works https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=243958 # on powerpc64 elfv1, clang doesn't work at all (no support for elfv1), on elfv2 clang from base works ok @@ -57,7 +57,7 @@ USES+= compiler:c++11-lang post-patch: @${REINPLACE_CMD} -e 's|/usr/local/include|${PREFIX}/include|' \ ${WRKSRC}/Jamfile - @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' \ + @${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|g' \ ${WRKSRC}/test/setup_transfer.cpp post-install: diff --git a/net-p2p/libtorrent-rasterbar/files/patch-test_setup__transfer.cpp b/net-p2p/libtorrent-rasterbar/files/patch-test_setup__transfer.cpp new file mode 100644 index 000000000000..7fbe44c48633 --- /dev/null +++ b/net-p2p/libtorrent-rasterbar/files/patch-test_setup__transfer.cpp @@ -0,0 +1,11 @@ +--- test/setup_transfer.cpp.orig 2020-04-29 20:34:31 UTC ++++ test/setup_transfer.cpp +@@ -604,7 +604,7 @@ std::string get_python() + if (sz == buf.size() - 1) return buf.data(); + } + #endif +- return "python"; ++ return "%%PYTHON%%"; + } + + } -- 2.26.2