Attachment 230716 Details for Bug 260943 – v0 (RC1)

[patch] v0 (RC1)

bug260943.diff (text/plain), 3.95 KB, created by Jan Beich on 2022-01-04 22:27:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2022-01-04 22:27:07 UTC

Size: 3.95 KB

patch

obsolete

>From 3d10b95358c440734dc18ce130c70e6f81696a0b Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 2 Jan 2022 20:22:48 +0000
>Subject: [PATCH] devel/meson: update to 0.61.0
>
>Changes:	https://mesonbuild.com/Release-notes-for-0-61-0.html
>PR:		260943
>Reported by:	GitHub (watch releases)
>Approved by:	tcberner
>Exp-run by:	antoine
>---
> devel/meson/Makefile                          |  2 +-
> devel/meson/distinfo                          |  6 +--
> .../patch-mesonbuild_backend_backends.py      | 40 -------------------
> 3 files changed, 4 insertions(+), 44 deletions(-)
> delete mode 100644 devel/meson/files/patch-mesonbuild_backend_backends.py
>
>diff --git a/devel/meson/Makefile b/devel/meson/Makefile
>index b5d9659131ca..36a85f08d2ad 100644
>--- a/devel/meson/Makefile
>+++ b/devel/meson/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Ting-Wei Lan <lantw44@gmail.com>
> 
> PORTNAME=	meson
>-PORTVERSION=	0.60.3
>+PORTVERSION=	0.61.0rc1
> CATEGORIES=	devel python
> MASTER_SITES=	https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
> 
>diff --git a/devel/meson/distinfo b/devel/meson/distinfo
>index 0a00e2dbfba7..53bbe9ab5949 100644
>--- a/devel/meson/distinfo
>+++ b/devel/meson/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1597508825
>-SHA256 (meson-0.60.3.tar.gz) = 87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e
>-SIZE (meson-0.60.3.tar.gz) = 2001124
>+TIMESTAMP = 1641154968
>+SHA256 (meson-0.61.0rc1.tar.gz) = 97cb2e7d2e8594f463c4d9374fff765cbebdfe22e4cfb4f3cd22570238471702
>+SIZE (meson-0.61.0rc1.tar.gz) = 2002209
>diff --git a/devel/meson/files/patch-mesonbuild_backend_backends.py b/devel/meson/files/patch-mesonbuild_backend_backends.py
>deleted file mode 100644
>index 4adb3d825661..000000000000
>--- a/devel/meson/files/patch-mesonbuild_backend_backends.py
>+++ /dev/null
>@@ -1,40 +0,0 @@
>-https://github.com/mesonbuild/meson/pull/4324
>-
>-From 068f0b3bc7becab6762ada45ecdd5dc601ee2473 Mon Sep 17 00:00:00 2001
>-From: Ting-Wei Lan <lantw@src.gnome.org>
>-Date: Thu, 4 Oct 2018 23:03:30 +0800
>-Subject: [PATCH] backends: Use raw_link_args to check for the need of RPATH
>-
>-Function rpaths_for_bundled_shared_libraries assumes it needs RPATH when
>-linking arguments of an external dependency has exactly one argument and
>-the only argument is an absolute path to a library file. This was mostly
>-fine because almost all .pc files use a -L -l pair instead of the full
>-path of the library, which means pkg-config dependencies almost always
>-have at least two arguments. However, there are patches landed in the
>-meson 0.47 cycle which convert -L -l pair returned by pkg-config to the
>-absolute path of library. If the output of pkg-config includes exactly
>-one -L argument and one -l argument, it will be converted to exactly one
>-absolute path by meson and rpaths_for_bundled_shared_libraries will
>-assume it needs RPATH. Since meson passes both -rpath and -rpath-link to
>-the linker and -rpath-link has precedence over LD_LIBRARY_PATH, it
>-changes the search order of dependent libraries in an unexpected way and
>-it causes a lot of linking troubles in JHBuild environments on FreeBSD.
>-
>-To make the method behave like the old way of using -L -l pairs and
>-avoid library path order problems, we use raw_link_args instead of
>-link_args here. raw_link_args stores the unmodified output of pkg-config
>-and it is much less likely to accidentally match the rule currently used
>-by the method.
>-
>-Works around https://github.com/mesonbuild/meson/issues/4270.
>---- mesonbuild/backend/backends.py.orig	2018-09-22 13:22:03 UTC
>-+++ mesonbuild/backend/backends.py
>-@@ -371,7 +371,7 @@ class Backend:
>-         for dep in target.external_deps:
>-             if not isinstance(dep, (dependencies.ExternalLibrary, dependencies.PkgConfigDependency)):
>-                 continue
>--            la = dep.link_args
>-+            la = dep.get_link_args(raw=True)
>-             if len(la) != 1 or not os.path.isabs(la[0]):
>-                 continue
>-             # The only link argument is an absolute path to a library file.

Actions: View | Diff

Attachments on bug 260943: 230716 | 230775 | 230938 | 231109 | 231308