mirror of
https://git.freebsd.org/ports.git
synced 2025-06-03 20:06:29 -04:00
Update meson to 0.46.1.
Remove patches that are included in this release. PR: 229086 Submitted by: Ting-Wei Lan <lantw44@gmail.com>
This commit is contained in:
Koop Mast
parent
1787e07150
commit
3c27f29d4e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=472993
4 changed files with 4 additions and 104 deletions
|
|
@ -2,8 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= meson
|
||||
PORTVERSION= 0.46.0
|
||||
PORTREVISION= 2
|
||||
PORTVERSION= 0.46.1
|
||||
CATEGORIES= devel python
|
||||
MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1524914549
|
||||
SHA256 (meson-0.46.0.tar.gz) = b7df91b01a358a8facdbfa33596a47cda38a760435ab55e1985c0bff06a9cbf0
|
||||
SIZE (meson-0.46.0.tar.gz) = 1200001
|
||||
TIMESTAMP = 1529220278
|
||||
SHA256 (meson-0.46.1.tar.gz) = 19497a03e7e5b303d8d11f98789a79aba59b5ad4a81bd00f4d099be0212cee78
|
||||
SIZE (meson-0.46.1.tar.gz) = 1203713
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
From cbc2f2d1df769123caa2e4562dbe1809cca1304d Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Pakkanen <jpakkane@gmail.com>
|
||||
Date: Sun, 29 Apr 2018 21:43:24 +0300
|
||||
Subject: [PATCH] Keep separator spaces in pkg-config declarations. Closes
|
||||
#3479.
|
||||
|
||||
---
|
||||
mesonbuild/modules/pkgconfig.py | 6 ++++--
|
||||
run_unittests.py | 11 +++++++++++
|
||||
test cases/unit/31 pkgconfig format/meson.build | 12 ++++++++++++
|
||||
test cases/unit/31 pkgconfig format/somelib.c | 5 +++++
|
||||
4 files changed, 32 insertions(+), 2 deletions(-)
|
||||
create mode 100644 test cases/unit/31 pkgconfig format/meson.build
|
||||
create mode 100644 test cases/unit/31 pkgconfig format/somelib.c
|
||||
|
||||
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
|
||||
index a3ba973f3..419a14c77 100644
|
||||
--- mesonbuild/modules/pkgconfig.py
|
||||
+++ mesonbuild/modules/pkgconfig.py
|
||||
@@ -139,8 +139,10 @@ def add_version_reqs(self, name, version_reqs):
|
||||
if version_reqs:
|
||||
if name not in self.version_reqs:
|
||||
self.version_reqs[name] = set()
|
||||
- # We could have '>=1.0' or '>= 1.0', remove spaces to normalize
|
||||
- new_vreqs = [s.replace(' ', '') for s in mesonlib.stringlistify(version_reqs)]
|
||||
+ # Note that pkg-config is picky about whitespace.
|
||||
+ # 'foo > 1.2' is ok but 'foo>1.2' is not.
|
||||
+ # foo, bar' is ok, but 'foo,bar' is not.
|
||||
+ new_vreqs = [s for s in mesonlib.stringlistify(version_reqs)]
|
||||
self.version_reqs[name].update(new_vreqs)
|
||||
|
||||
def split_version_req(self, s):
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
From a3b2ae8ebcdcebd68b8a217d03102c6d03fcb766 Mon Sep 17 00:00:00 2001
|
||||
From: Nirbheek Chauhan <nirbheek@centricular.com>
|
||||
Date: Tue, 1 May 2018 17:54:54 +0530
|
||||
Subject: [PATCH] pkgconfig: Don't expose internal libraries in .pc files
|
||||
|
||||
Libraries that have been linked with link_whole: are internal
|
||||
implementation details and should never be exposed to the outside
|
||||
world in either Libs: or Libs.private:
|
||||
|
||||
Closes https://github.com/mesonbuild/meson/issues/3509
|
||||
---
|
||||
mesonbuild/build.py | 12 +++++++++---
|
||||
mesonbuild/modules/pkgconfig.py | 4 ++--
|
||||
run_unittests.py | 11 ++++++-----
|
||||
test cases/unit/31 pkgconfig format/meson.build | 5 +++--
|
||||
test cases/unit/31 pkgconfig format/somelib.c | 4 +++-
|
||||
test cases/unit/31 pkgconfig format/someret.c | 3 +++
|
||||
6 files changed, 26 insertions(+), 13 deletions(-)
|
||||
create mode 100644 test cases/unit/31 pkgconfig format/someret.c
|
||||
|
||||
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
|
||||
index 3d531d181..a2d024aec 100644
|
||||
--- mesonbuild/build.py
|
||||
+++ mesonbuild/build.py
|
||||
@@ -817,16 +817,22 @@ def get_outputs(self):
|
||||
def get_extra_args(self, language):
|
||||
return self.extra_args.get(language, [])
|
||||
|
||||
- def get_dependencies(self, exclude=None):
|
||||
+ def get_dependencies(self, exclude=None, internal=True):
|
||||
transitive_deps = []
|
||||
if exclude is None:
|
||||
exclude = []
|
||||
- for t in itertools.chain(self.link_targets, self.link_whole_targets):
|
||||
+ if internal:
|
||||
+ link_targets = itertools.chain(self.link_targets, self.link_whole_targets)
|
||||
+ else:
|
||||
+ # We don't want the 'internal' libraries when generating the
|
||||
+ # `Libs:` and `Libs.private:` lists in pkg-config files.
|
||||
+ link_targets = self.link_targets
|
||||
+ for t in link_targets:
|
||||
if t in transitive_deps or t in exclude:
|
||||
continue
|
||||
transitive_deps.append(t)
|
||||
if isinstance(t, StaticLibrary):
|
||||
- transitive_deps += t.get_dependencies(transitive_deps + exclude)
|
||||
+ transitive_deps += t.get_dependencies(transitive_deps + exclude, internal)
|
||||
return transitive_deps
|
||||
|
||||
def get_source_subdir(self):
|
||||
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
|
||||
index 419a14c77..365d3cd37 100644
|
||||
--- mesonbuild/modules/pkgconfig.py
|
||||
+++ mesonbuild/modules/pkgconfig.py
|
||||
@@ -123,10 +123,10 @@ def _process_libs(self, libs, public):
|
||||
if not hasattr(obj, 'generated_pc'):
|
||||
obj.generated_pc = self.name
|
||||
if isinstance(obj, build.StaticLibrary) and public:
|
||||
- self.add_pub_libs(obj.get_dependencies())
|
||||
+ self.add_pub_libs(obj.get_dependencies(internal=False))
|
||||
self.add_pub_libs(obj.get_external_deps())
|
||||
else:
|
||||
- self.add_priv_libs(obj.get_dependencies())
|
||||
+ self.add_priv_libs(obj.get_dependencies(internal=False))
|
||||
self.add_priv_libs(obj.get_external_deps())
|
||||
elif isinstance(obj, str):
|
||||
processed_libs.append(obj)
|
||||
Loading…
Add table
Reference in a new issue