From patchwork Fri Jan 4 19:32:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1020888 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43WZgk5NhLz9rxp for ; Sat, 5 Jan 2019 06:32:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1E7FC87824; Fri, 4 Jan 2019 19:32:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aJNHJINjCEN2; Fri, 4 Jan 2019 19:32:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 62CBA87820; Fri, 4 Jan 2019 19:32:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 7717D1C327A for ; Fri, 4 Jan 2019 19:32:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 748602352E for ; Fri, 4 Jan 2019 19:32:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pUBW1XYEq3FZ for ; Fri, 4 Jan 2019 19:32:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by silver.osuosl.org (Postfix) with ESMTPS id 500732263C for ; Fri, 4 Jan 2019 19:32:40 +0000 (UTC) Received: from localhost.localdomain ([178.7.119.158]) by mail.gmx.com (mrgmx003 [212.227.17.190]) with ESMTPSA (Nemesis) id 0Lj1Cw-1hAicv3w34-00dGgk; Fri, 04 Jan 2019 20:32:36 +0100 From: Peter Seiderer To: buildroot@buildroot.org Date: Fri, 4 Jan 2019 20:32:33 +0100 Message-Id: <20190104193233.27527-1-ps.report@gmx.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:J0taVSgshroUENtAhxyYoJ8KRaDHL21c1NJX/6M7vmTKwGfRWed nE7dHj7WkqzGhtKu6k3YmoN1ZmXCgKVB5k4x4f7fizVhG6iOWiOaEYF7iWx7bMb74Uv5qWk 2Rz+nee3wCkcLa+JuhfYKRA5TLsdz45cyt5fDWFg3KV520pMj+3wQ/d58uhJUX5O/3eay+u +ZL/UF0zygaCvcnh3hnrw== X-UI-Out-Filterresults: notjunk:1; V03:K0:H1Eb6rmhmdY=:TRZBEOw7s9BXdgitMl7+dI qc8yO1R6qDgfdrMyczbZLJKFAmbJNwnIZNvweXpaMoFAVL+3eaVmAcJo9/HzlZCL6UJWmgVVu wrIsWPMfjk0sw4Mqv3WfQu5d1VgmnQe6roxNfIViLXIlsjlLd2Hhmwbf/lV9tx6YUpEI2bQrk rpGA9WWoDyhZ/og1bIjNrkeV7dJYe0H2vrASM5qJrmZh3hzZNIyz6u/UM0in8aZbT7Yyl6HZ1 lJh6n2Px8/8Wf3Ctff9QZIe66BRMwwNoXcomBa/rCAPKPDF1xqD90O7Yet0YgvDCDLWm3UOBy deZvS+Gz46hz98kdKq9qDKCYAhoqT9w+ATzfa/K4DiOFK5wfR9qJ+V0noX2oJ24U+r3TRuewH pMbooo1rMpV7iWdguFwEXHUF1e1Kaaiu5Jz63dIrZmu02XEIvFgUUtisQ+4/Y5YXrwG16X+/N 7rsP9NKEDxGL+aOjRCTdgWgmqsv29kMlIXFo2wGf5n5x8SIdnxISlhV6gbrUxxtzSwWPRv2HX Dd5G4NsUbDtbUsqDL0D+uLgvKlrqocxBkPShGffTIm5ntMnz7MPWjXy5xX+fyRE8+TWuaHpz9 GcJS8I2tOlrGpGu1M4IlQ9vh7vcKENc+WYdXlc2YhBMVN+icvNw1cnkRpb5T+HaPMzkXjakSR l4hRpj3lj6qIl0tWZ8u/bv/AVk2ZDkWrX7BqpKMHdoLY+zmnB4sdxxXQwJgLtt+wJ8VZztLsF U44D0ebGuBCVYBhdE4oR7oT872n1E8W+q4DcJRRV0EewCbrRS1nmQNmA2Sa6KzI7YirDb7LlO xgcDi+dGz4BVrVEXZDUHO9uXcb+sUHyCMQxH1UR6bI4JIS8hYZw2EAtrwzw6WxiKKcF4ZAptq F5S6/PRpPP0DSTpxcL8eG/nMNVhGSIqSNeVvH1uCY= Subject: [Buildroot] [PATCH v1] meson: fix RPATH patch X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The re-added ([1]) patch missed to remove two lines of the original unconditional code. [1] https://git.buildroot.net/buildroot/commit/?id=5c939246a802c0ad9704dac1505105037542a1d3 Signed-off-by: Peter Seiderer --- ...-RPATH-if-install_rpath-is-not-empty.patch | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch b/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch index 0e59907a05..a7b66c1067 100644 --- a/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch +++ b/package/meson/0001-Only-fix-RPATH-if-install_rpath-is-not-empty.patch @@ -1,21 +1,25 @@ -From 649140f09d8a8805125830cd7b2327d35447ffe8 Mon Sep 17 00:00:00 2001 +From 4db4fd79d9bb2b98cea1117f22b6c97942ab2ecd Mon Sep 17 00:00:00 2001 From: Eric Le Bihan Date: Sat, 14 Jul 2018 11:18:45 +0200 Subject: [PATCH] Only fix RPATH if install_rpath is not empty Signed-off-by: Eric Le Bihan +[Fix: remove leftover from original/unconditional code] +Signed-off-by: Peter Seiderer --- - mesonbuild/minstall.py | 8 ++++++++ - 1 file changed, 8 insertions(+) + mesonbuild/minstall.py | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py -index 1d721795..e04e1f6a 100644 +index 8ac6aab1..7ef04116 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py -@@ -495,6 +495,14 @@ class Installer: +@@ -478,8 +478,14 @@ class Installer: + printed_symlink_error = True + if os.path.isfile(outname): try: - depfixer.fix_rpath(outname, install_rpath, final_path, - install_name_mappings, verbose=False) +- depfixer.fix_rpath(outname, install_rpath, final_path, +- install_name_mappings, verbose=False) + # Buildroot check-host-rpath script expects RPATH + # But if install_rpath is empty, it will stripped. + # So, preserve it in this case @@ -28,5 +32,5 @@ index 1d721795..e04e1f6a 100644 if isinstance(e.code, int) and e.code == 0: pass -- -2.14.4 +2.20.1