diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2022-03-17 18:13:20 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2022-03-17 21:08:57 +0000 |
| commit | 06a5762c969217e08068e90e91c1edb171706fa5 (patch) | |
| tree | 4d3505b3f7eaf2b29dabfe1bac975e9666099493 | |
| parent | eeff2c2e0aeb46982afee06187becf1275293cb1 (diff) | |
| download | ports-06a5762c969217e08068e90e91c1edb171706fa5.tar.gz ports-06a5762c969217e08068e90e91c1edb171706fa5.zip | |
games/spring: switch from p7zip to 7-Zip
PR: 262592
Submitted by: makc
| -rw-r--r-- | games/spring/Makefile | 2 | ||||
| -rw-r--r-- | games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/games/spring/Makefile b/games/spring/Makefile index bdb8c17f7c19..0e25bcea07d6 100644 --- a/games/spring/Makefile +++ b/games/spring/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libcurl.so:ftp/curl \ libunwind.so:devel/libunwind \ libjsoncpp.so:devel/jsoncpp -BUILD_DEPENDS= 7z:archivers/p7zip +BUILD_DEPENDS= 7zz:archivers/7-zip BROKEN_FreeBSD_12= ld: error: undefined symbol: streflop_libm::__inline_isnanf(float) ONLY_FOR_ARCHS= amd64 diff --git a/games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake b/games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake new file mode 100644 index 000000000000..e75226c6175a --- /dev/null +++ b/games/spring/files/patch-rts_build_cmake_FindSevenZip.cmake @@ -0,0 +1,11 @@ +--- rts/build/cmake/FindSevenZip.cmake.orig 2020-12-26 12:45:43 UTC ++++ rts/build/cmake/FindSevenZip.cmake +@@ -23,7 +23,7 @@ ENDIF (SEVENZIP_BIN) + set(progfilesx86 "ProgramFiles(x86)") + + find_program(SEVENZIP_BIN +- NAMES 7z 7za ++ NAMES 7zz + HINTS "${MINGWDIR}" "${MINGWLIBS}/bin" "$ENV{${progfilesx86}}/7-zip" "$ENV{ProgramFiles}/7-zip" "$ENV{ProgramW6432}/7-zip" + PATH_SUFFIXES bin + DOC "7zip executable" |