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 CC6291382C5 for ; Fri, 19 Jun 2020 18:38:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDBB9E0831; Fri, 19 Jun 2020 18:38:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B417BE0831 for ; Fri, 19 Jun 2020 18:38:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 62B1634F32F for ; Fri, 19 Jun 2020 18:38:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BCEC2A5 for ; Fri, 19 Jun 2020 18:38:08 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1592591856.52e6f6885bc2ad773632576a5262b5f51509c4cc.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch dev-util/meson/meson-0.54.2.ebuild dev-util/meson/meson-9999.ebuild X-VCS-Directories: dev-util/meson/files/ dev-util/meson/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 52e6f6885bc2ad773632576a5262b5f51509c4cc X-VCS-Branch: master Date: Fri, 19 Jun 2020 18:38:08 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 86d4bf4c-41b9-4be1-b49e-1fe320744d61 X-Archives-Hash: 8ca71c2eaa9619da1d6110321d5d3cbf commit: 52e6f6885bc2ad773632576a5262b5f51509c4cc Author: Fabian Groffen gentoo org> AuthorDate: Fri Jun 19 18:36:55 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Jun 19 18:37:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52e6f688 dev-util/meson-0.54.2: fix installing binaries on Prefix Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Fabian Groffen gentoo.org> .../files/0.54.2-prefix-dont-strip-rpath.patch | 25 ++++++++++++++++++++++ dev-util/meson/meson-0.54.2.ebuild | 2 ++ dev-util/meson/meson-9999.ebuild | 2 ++ 3 files changed, 29 insertions(+) diff --git a/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch b/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch new file mode 100644 index 00000000000..1fe2e1ac4cc --- /dev/null +++ b/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch @@ -0,0 +1,25 @@ +https://bz-attachments.freebsd.org/attachment.cgi?id=204611 +https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238128 + +Stripping RPATH on Prefix is really bad, because it means the default +RPATH entries disappear, and any installed binaries don't work (get +kernel traps). + +Extracted the minstall patch from the FreeBSD full patch. + +--- a/mesonbuild/minstall.py ++++ b/mesonbuild/minstall.py +@@ -488,8 +488,11 @@ + printed_symlink_error = True + if os.path.isfile(outname): + try: +- depfixer.fix_rpath(outname, install_rpath, final_path, +- install_name_mappings, verbose=False) ++ if install_rpath: ++ depfixer.fix_rpath(outname, install_rpath, final_path, ++ install_name_mappings, verbose=False) ++ else: ++ print("RPATH changes at install time disabled") + except SystemExit as e: + if isinstance(e.code, int) and e.code == 0: + pass diff --git a/dev-util/meson/meson-0.54.2.ebuild b/dev-util/meson/meson-0.54.2.ebuild index 7f1a4c1f652..eee417491e8 100644 --- a/dev-util/meson/meson-0.54.2.ebuild +++ b/dev-util/meson/meson-0.54.2.ebuild @@ -60,6 +60,8 @@ python_prepare_all() { # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch + distutils-r1_python_prepare_all } diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild index 5cd9c5f13bb..edbd30f5116 100644 --- a/dev-util/meson/meson-9999.ebuild +++ b/dev-util/meson/meson-9999.ebuild @@ -56,6 +56,8 @@ python_prepare_all() { # Broken due to python2 script created by python_wrapper_setup rm -r "test cases/frameworks/1 boost" || die + use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch + distutils-r1_python_prepare_all }