Attachment 205303 Details for Bug 238726 – v3

[patch] v3

meson.v3.diff (text/plain), 3.91 KB, created by Tobias Kortkamp on 2019-06-24 01:05:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2019-06-24 01:05:22 UTC

Size: 3.91 KB

patch

obsolete

>Index: devel/meson/Makefile
>===================================================================
>--- devel/meson/Makefile	(revision 504997)
>+++ devel/meson/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	meson
>-PORTVERSION=	0.50.0
>+PORTVERSION=	0.51.0
> CATEGORIES=	devel python
> MASTER_SITES=	https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
> 
>Index: devel/meson/distinfo
>===================================================================
>--- devel/meson/distinfo	(revision 504997)
>+++ devel/meson/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1554794341
>-SHA256 (meson-0.50.0.tar.gz) = 2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f
>-SIZE (meson-0.50.0.tar.gz) = 1399202
>+TIMESTAMP = 1561108166
>+SHA256 (meson-0.51.0.tar.gz) = 2f75fdf6d586d3595c03a07afcd0eaae11f68dd33fea5906a434d22a409ed63f
>+SIZE (meson-0.51.0.tar.gz) = 1449724
>Index: devel/meson/files/patch-mesonbuild_dependencies_base.py
>===================================================================
>--- devel/meson/files/patch-mesonbuild_dependencies_base.py	(revision 504997)
>+++ devel/meson/files/patch-mesonbuild_dependencies_base.py	(working copy)
>@@ -1,6 +1,6 @@
> https://github.com/mesonbuild/meson/pull/4325
> 
>-From 158d627c141859e28bbca2c2126b5306608aac6e Mon Sep 17 00:00:00 2001
>+From c4686de2612157a4040766738a700b710d866da4 Mon Sep 17 00:00:00 2001
> From: Ting-Wei Lan <lantw@src.gnome.org>
> Date: Thu, 4 Oct 2018 23:30:28 +0800
> Subject: [PATCH] PkgConfigDependency: Sort -L flags according to
>@@ -51,9 +51,10 @@
> users, without depending on the unreliable part of pkg-config output.
> 
> Fixes https://github.com/mesonbuild/meson/issues/4271.
>---- mesonbuild/dependencies/base.py.orig	2018-09-22 13:22:03 UTC
>+
>+--- mesonbuild/dependencies/base.py.orig
> +++ mesonbuild/dependencies/base.py
>-@@ -604,6 +604,21 @@ class PkgConfigDependency(ExternalDepend
>+@@ -706,6 +706,21 @@ def _set_cargs(self):
>                                        (self.name, out))
>          self.compile_args = self._convert_mingw_paths(shlex.split(out))
>  
>@@ -75,10 +76,10 @@
>      def _search_libs(self, out, out_raw):
>          '''
>          @out: PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 pkg-config --libs
>-@@ -635,6 +650,22 @@ class PkgConfigDependency(ExternalDepend
>-         for arg in raw_link_args:
>-             if arg.startswith('-L') and not arg.startswith(('-L-l', '-L-L')):
>-                 prefix_libpaths.add(arg[2:])
>+@@ -741,6 +756,22 @@ def _search_libs(self, out, out_raw):
>+                     # Resolve the path as a compiler in the build directory would
>+                     path = os.path.join(self.env.get_build_dir(), path)
>+                 prefix_libpaths.add(path)
> +        # Library paths are not always ordered in a meaningful way
> +        #
> +        # Instead of relying on pkg-config or pkgconf to provide -L flags in a
>Index: shells/ksh93/Makefile
>===================================================================
>--- shells/ksh93/Makefile	(revision 504997)
>+++ shells/ksh93/Makefile	(working copy)
>@@ -20,9 +20,7 @@
> KSH_CONFLICTS=		pdksh-*
> KSH93_CONFLICTS=	ksh93-devel-* ast-ksh-*
> 
>-LDFLAGS+=	-lm
> MESON_BUILD_DIR=	build
>-MAKE_ENV=	CCFLAGS="${CFLAGS}"
> 
> OPTIONS_DEFAULT=	KSH93
> OPTIONS_SINGLE=		BIN_KSH
>Index: shells/ksh93-devel/Makefile
>===================================================================
>--- shells/ksh93-devel/Makefile	(revision 504997)
>+++ shells/ksh93-devel/Makefile	(working copy)
>@@ -23,9 +23,7 @@
> KSH_CONFLICTS=		pdksh-*
> KSH93_CONFLICTS=	ksh93-2* ast-ksh-*
> 
>-LDFLAGS+=	-lm
> MESON_BUILD_DIR=	build
>-MAKE_ENV=	CCFLAGS="${CFLAGS}"
> 
> OPTIONS_DEFAULT=	KSH93
> OPTIONS_SINGLE=		BIN_KSH
>Index: x11/terminology/Makefile
>===================================================================
>--- x11/terminology/Makefile	(revision 504997)
>+++ x11/terminology/Makefile	(working copy)
>@@ -22,6 +22,6 @@
> 
> NLS_USES=		gettext
> NLS_MESON_TRUE=		nls
>-NLS_LDFLAGS=		-lintl
>+NLS_LDFLAGS=		-L${LOCALBASE}/lib -lintl
> 
> .include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 238726: 205240 | 205255 | 205294 | 205303