1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

devel/meson: Update to 0.51.0

Changes:	https://mesonbuild.com/Release-notes-for-0-51-0.html
PR:		238726
Submitted by:	greg@unrelenting.technology (update to 0.50.1)
Exp-run by:	antoine
This commit is contained in:
Tobias Kortkamp 2019-06-24 05:59:31 +00:00
parent 93bd905f8a
commit 4355da35e0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=505003
6 changed files with 13 additions and 16 deletions

View File

@ -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}/

View File

@ -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

View File

@ -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 @@ library files. This makes sure that we always follow the preferences of
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 @@ Fixes https://github.com/mesonbuild/meson/issues/4271.
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

View File

@ -23,9 +23,7 @@ GH_TAGNAME= ${HASH}
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

View File

@ -20,9 +20,7 @@ GH_TAGNAME= ${HASH}
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

View File

@ -22,6 +22,6 @@ OPTIONS_SUB= yes
NLS_USES= gettext
NLS_MESON_TRUE= nls
NLS_LDFLAGS= -lintl
NLS_LDFLAGS= -L${LOCALBASE}/lib -lintl
.include <bsd.port.mk>