Date: Thu, 3 Nov 2022 18:26:52 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b0e38b17abbe - main - games/warzone2100: fix build Message-ID: <202211031826.2A3IQqTw013356@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=b0e38b17abbebfd75ba6747f7d6b65a7fa388621 commit b0e38b17abbebfd75ba6747f7d6b65a7fa388621 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2022-11-03 18:11:49 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2022-11-03 18:26:46 +0000 games/warzone2100: fix build Fix build by linking with dynamic SDL2 library instead of the static one, which pulls transitive dependencies in a broken way. Reported by: pkg-fallout, fluffy --- games/warzone2100/files/patch-lib_sdl_CMakeLists.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt b/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt new file mode 100644 index 000000000000..466265d6a4df --- /dev/null +++ b/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt @@ -0,0 +1,17 @@ +--- lib/sdl/CMakeLists.txt.orig 2022-11-03 17:44:55 UTC ++++ lib/sdl/CMakeLists.txt +@@ -49,14 +49,6 @@ if(NOT DEFINED WZ_FINDSDL2_NOCONFIG OR NOT WZ_FINDSDL2 + find_package(SDL2 ${SDL2_MIN_VERSION} CONFIG QUIET) + endif() + if(SDL2_FOUND) +- if (TARGET SDL2::SDL2-static) +- # Check for INTERFACE_INCLUDE_DIRECTORIES to ignore the "aliased" target that vcpkg creates +- get_target_property(_sdl2_include_dir SDL2::SDL2-static INTERFACE_INCLUDE_DIRECTORIES) +- test_link_to_sdl_target(SDL2::SDL2-static LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) +- if (_sdl2_include_dir AND LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) +- set(_sdl2_library SDL2::SDL2-static) +- endif() +- endif() + if (NOT _sdl2_library AND TARGET SDL2::SDL2) + # Check for INTERFACE_INCLUDE_DIRECTORIES to ignore the "aliased" target that vcpkg creates + get_target_property(_sdl2_include_dir SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202211031826.2A3IQqTw013356>