[gentoo-commits] repo/gentoo:master commit in: games-strategy/hedgewars/, games-strategy/hedgewars/files/

[David Seifert]

commit:     44d97ca6726a2091923be22883125e14b6b01b3e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 09:46:25 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 10:50:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d97ca6

games-strategy/hedgewars: Remove RPATHs

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 .../hedgewars/files/hedgewars-0.9.22-rpath-fix.patch           | 10 ++++++++++
 games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild            |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch 
b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
new file mode 100644
index 00000000000..332c0c3ce4a
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
@@ -0,0 +1,10 @@
+diff -up hedgewars-src-0.9.22/cmake_modules/paths.cmake~ 
hedgewars-src-0.9.22/cmake_modules/paths.cmake
+--- hedgewars-src-0.9.22/cmake_modules/paths.cmake~    2015-12-02 
15:02:38.000000000 +0100
++++ hedgewars-src-0.9.22/cmake_modules/paths.cmake     2015-12-02 
15:15:24.729980850 +0100
+@@ -67,5 +67,5 @@ else(APPLE AND NOT (${CMAKE_INSTALL_PREF
+     # - the third one is the full path of the system dir
+     #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html
+     #skip this if the install prefix is the standard one
+-    set(CMAKE_INSTALL_RPATH 
"$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
++    #set(CMAKE_INSTALL_RPATH 
"$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
+ endif(APPLE)

diff --git a/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild 
b/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
index d7016bea411..d447ec2bd15 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild
@@ -46,6 +46,7 @@ RDEPEND="${CDEPEND}
        >=media-fonts/dejavu-2.28"
 
 S=${WORKDIR}/${MY_P}
+PATCHES=( "${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch )
 
 src_prepare() {
        while IFS="" read -r f ; do
@@ -64,6 +65,9 @@ src_configure() {
                -DNOSERVER=TRUE
                -DCMAKE_VERBOSE_MAKEFILE=TRUE
                -DPHYSFS_SYSTEM=ON
+               # upstream sets RPATH that leafs to weird breakage
+               # https://bugzilla.redhat.com/show_bug.cgi?id=1200193
+               -DCMAKE_SKIP_RPATH=ON
        )
        cmake-utils_src_configure
 }