diff options
| author |   David Seifert <soap@gentoo.org> | 2017-11-19 10:46:25 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2017-11-19 11:50:39 +0100 |
| commit | 44d97ca6726a2091923be22883125e14b6b01b3e (patch) | |
| tree | e3b70d8108972ff04c820cc011bf8f302ea23fa4 /games-strategy/hedgewars | |
| parent | dev-db/mysql-workbench: add 6.3.10 (diff) | |
| download | gentoo-44d97ca6726a2091923be22883125e14b6b01b3e.tar.gz gentoo-44d97ca6726a2091923be22883125e14b6b01b3e.tar.bz2 gentoo-44d97ca6726a2091923be22883125e14b6b01b3e.zip | |
games-strategy/hedgewars: Remove RPATHs
Package-Manager: Portage-2.3.14, Repoman-2.3.6
Diffstat (limited to 'games-strategy/hedgewars')
| -rw-r--r-- | games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch | 10 | ||||
| -rw-r--r-- | games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild | 4 |
2 files changed, 14 insertions, 0 deletions
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 000000000000..332c0c3ce4ac --- /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 d7016bea411e..d447ec2bd156 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 } |