summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2020-03-12 18:30:52 +0100
committerLars Wendler <polynomial-c@gentoo.org>2020-03-12 18:30:52 +0100
commitbe975d4634d9e9dbbc257d4b632d5d2c67d37112 (patch)
tree0dce1ce5904f0912dccf441c597668be8e19a5ab
parentdev-libs/nss-pem: Fixed installation in multilib environment (diff)
downloadgentoo-be975d4634d9e9dbbc257d4b632d5d2c67d37112.tar.gz
gentoo-be975d4634d9e9dbbc257d4b632d5d2c67d37112.tar.bz2
gentoo-be975d4634d9e9dbbc257d4b632d5d2c67d37112.zip
games-strategy/widelands: Fixed build with media-libs/libglvnd
Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
-rw-r--r--games-strategy/widelands/files/widelands-0.20-glvnd.patch25
-rw-r--r--games-strategy/widelands/widelands-0.20-r1.ebuild (renamed from games-strategy/widelands/widelands-0.20.ebuild)1
2 files changed, 26 insertions, 0 deletions
diff --git a/games-strategy/widelands/files/widelands-0.20-glvnd.patch b/games-strategy/widelands/files/widelands-0.20-glvnd.patch
new file mode 100644
index 00000000000..94d1aa3850c
--- /dev/null
+++ b/games-strategy/widelands/files/widelands-0.20-glvnd.patch
@@ -0,0 +1,25 @@
+From 4661768699c4651df1668fbfe0e24bb02bf10db1 Mon Sep 17 00:00:00 2001
+From: franku <somal@arcor.de>
+Date: Thu, 18 Jul 2019 19:30:34 +0200
+Subject: [PATCH] use link_libraries instead of set(CMAKE_EXE_LINKER_FLAGS...
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c5ca8a60b..bcff2db2ff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,7 +181,7 @@ endif(OPTION_ASAN)
+
+ # This is set to avoid linker errors when using GLVND-libs on Linux
+ if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
+- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL")
++ link_libraries("GL")
+ add_compile_definitions(WL_USE_GLVND)
+ message(STATUS "Adding linker flags for GLVND.")
+ endif()
+--
+2.25.1
+
diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild
index e714c6e11a9..335598744fe 100644
--- a/games-strategy/widelands/widelands-0.20.ebuild
+++ b/games-strategy/widelands/widelands-0.20-r1.ebuild
@@ -44,6 +44,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch"
+ "${FILESDIR}/${PN}-0.20-glvnd.patch"
)
src_prepare() {