public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: 0.55.0 → 0.55.1

Browse Source 
https://github.com/mesonbuild/meson/compare/0.55.0...0.55.1

setuptools have been removed from runtime dependencies:
https://github.com/mesonbuild/meson/pull/7461
This commit is contained in:
Jan Tojnar 2020-08-16 02:02:05 +02:00
parent b67f9d752c
commit c6acf50360
6 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch
View File

@ -1,6 +1,6 @@
--- a/mesonbuild/coredata.py --- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py
@@ -483,7 +483,6 @@ class CoreData: @@ -491,7 +491,6 @@ class CoreData:
return value return value
if option.endswith('dir') and value.is_absolute() and \ if option.endswith('dir') and value.is_absolute() and \
option not in builtin_dir_noprefix_options: option not in builtin_dir_noprefix_options:
@ -8,7 +8,7 @@
# commonpath will always return a path in the native format, so we # commonpath will always return a path in the native format, so we
# must use pathlib.PurePath to do the same conversion before # must use pathlib.PurePath to do the same conversion before
# comparing. # comparing.
@@ -495,7 +494,7 @@ class CoreData: @@ -503,7 +502,7 @@ class CoreData:
try: try:
value = value.relative_to(prefix) value = value.relative_to(prefix)
except ValueError: except ValueError:

4
pkgs/development/tools/build-managers/meson/clear-old-rpath.patch
View File

@ -1,8 +1,8 @@
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
index 77ac03d66..d12f77592 100644 index 4176b9a03..faaabf616 100644
--- a/mesonbuild/scripts/depfixer.py --- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py +++ b/mesonbuild/scripts/depfixer.py
@@ -337,6 +337,15 @@ class Elf(DataSizes): @@ -336,6 +336,15 @@ class Elf(DataSizes):
if not new_rpath: if not new_rpath:
self.remove_rpath_entry(entrynum) self.remove_rpath_entry(entrynum)
else: else:

8
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -9,11 +9,11 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "meson"; pname = "meson";
version = "0.55.0"; version = "0.55.1";
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "Chriv+KuFKxHWTU3+TKQ+3npt3XFW0xTwoK8PKN0WzU="; sha256 = "O1dB+ITgSSi9+hlHRn/wavpsmOYjwlzvda33HKOc4IA=";
}; };
patches = [ patches = [
@ -67,10 +67,6 @@ python3.pkgs.buildPythonApplication rec {
# workaround until https://github.com/mesonbuild/meson/pull/6512 lands. # workaround until https://github.com/mesonbuild/meson/pull/6512 lands.
depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ]; depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ];
pythonPath = [
python3.pkgs.setuptools # for pkg_resources
];
# 0.45 update enabled tests but they are failing # 0.45 update enabled tests but they are failing
doCheck = false; doCheck = false;
# checkInputs = [ ninja pkgconfig ]; # checkInputs = [ ninja pkgconfig ];

8
pkgs/development/tools/build-managers/meson/fix-rpath.patch
View File

@ -1,6 +1,6 @@
--- a/mesonbuild/backend/backends.py --- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py
@@ -453,6 +453,21 @@ class Backend: @@ -456,6 +456,21 @@ class Backend:
args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang)) args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang))
except Exception: except Exception:
pass pass
@ -19,6 +19,6 @@
+ dirs.add(flag) + dirs.add(flag)
+ next_is_path = False + next_is_path = False
+ +
for arg in args: # Match rpath formats:
if arg.startswith('-Wl,-rpath='): # -Wl,-rpath=
for dir in arg.replace('-Wl,-rpath=','').split(':'): # -Wl,-rpath,

6
pkgs/development/tools/build-managers/meson/gir-fallback-path.patch
View File

@ -1,8 +1,8 @@
--- a/mesonbuild/modules/gnome.py --- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py
@@ -801,6 +801,13 @@ class GnomeModule(ExtensionModule): @@ -807,6 +807,13 @@ class GnomeModule(ExtensionModule):
scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_source_dir(), self.interpreter.subproject_dir, state.subproject)] if fatal_warnings:
scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_build_dir(), self.interpreter.subproject_dir, state.subproject)] scan_command.append('--warn-error')
+ if len(set([girtarget.get_custom_install_dir()[0] for girtarget in girtargets])) > 1: + if len(set([girtarget.get_custom_install_dir()[0] for girtarget in girtargets])) > 1:
+ raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets]))) + raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets])))

4
pkgs/development/tools/build-managers/meson/more-env-vars.patch
View File

@ -1,8 +1,8 @@
diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
index 17058df6b..7a68b7f15 100644 index 219b62ec8..e3ceaddbd 100644
--- a/mesonbuild/envconfig.py --- a/mesonbuild/envconfig.py
+++ b/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py
@@ -120,7 +120,7 @@ def get_env_var_pair(for_machine: MachineChoice, @@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice,
# compiling we fall back on the unprefixed host version. This # compiling we fall back on the unprefixed host version. This
# allows native builds to never need to worry about the 'BUILD_*' # allows native builds to never need to worry about the 'BUILD_*'
# ones. # ones.