From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 851F71396D9 for ; Sun, 19 Nov 2017 10:51:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7899FE0C04; Sun, 19 Nov 2017 10:51:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4EB18E0C04 for ; Sun, 19 Nov 2017 10:51:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EDEAC33BF0B for ; Sun, 19 Nov 2017 10:51:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 841A5A01A for ; Sun, 19 Nov 2017 10:50:59 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1511088639.44d97ca6726a2091923be22883125e14b6b01b3e.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/hedgewars/, games-strategy/hedgewars/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch games-strategy/hedgewars/hedgewars-0.9.22-r2.ebuild X-VCS-Directories: games-strategy/hedgewars/files/ games-strategy/hedgewars/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 44d97ca6726a2091923be22883125e14b6b01b3e X-VCS-Branch: master Date: Sun, 19 Nov 2017 10:50:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c10e907e-9548-4d4a-98fe-120687024602 X-Archives-Hash: bf9bc87029d79092e700992e929b3dde commit: 44d97ca6726a2091923be22883125e14b6b01b3e Author: David Seifert gentoo org> AuthorDate: Sun Nov 19 09:46:25 2017 +0000 Commit: David Seifert gentoo 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 }