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

Merge pull request #51890 from jtojnar/meson-0.49

Browse Source 
meson: 0.48.2 → 0.49.0
This commit is contained in:
Jan Tojnar 2018-12-12 19:29:58 +01:00 committed by GitHub
commit 3f1a785acc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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
@@ -298,18 +298,13 @@ @@ -375,18 +375,13 @@
''' '''
if option.endswith('dir') and os.path.isabs(value) and \ if option.endswith('dir') and os.path.isabs(value) and \
option not in builtin_dir_noprefix_options: option not in builtin_dir_noprefix_options:

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

@ -1,12 +1,12 @@
{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: { lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
version = "0.48.2"; version = "0.49.0";
pname = "meson"; pname = "meson";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1shfbr0mf8gmwpw5ivrmwp8282qw9mfhxmccd7fsgidp4x3nslby"; sha256 = "0895igla1qav8k250z2qv03a0fg491wzzkfpbk50wwq848vmbkd0";
}; };
postFixup = '' postFixup = ''

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

@ -1,27 +1,18 @@
--- a/mesonbuild/compilers/compilers.py --- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py
@@ -1112,6 +1112,8 @@ @@ -1202,8 +1202,10 @@
for p in rpath_paths: # In order to avoid relinking for RPATH removal, the binary needs to contain just
if p == from_dir: # enough space in the ELF header to hold the final installation RPATH.
relative = '' # relpath errors out in this case paths = ':'.join(all_paths)
+ elif os.path.isabs(p): - if len(paths) < len(install_rpath):
+ relative = p # These can be outside of build dir. - padding = 'X' * (len(install_rpath) - len(paths))
else: + store_paths = ':'.join(filter(lambda path: path.startswith('@storeDir@'), all_paths))
relative = os.path.relpath(os.path.join(build_dir, p), os.path.join(build_dir, from_dir)) + extra_space_needed = len(install_rpath + (':' if install_rpath and store_paths else '') + store_paths) - len(paths)
rel_rpaths.append(relative) + if extra_space_needed > 0:
@@ -1121,8 +1123,10 @@ + padding = 'X' * extra_space_needed
if paths != '': if not paths:
paths += ':' paths = padding
paths += build_rpath else:
- if len(paths) < len(install_rpath):
- padding = 'X' * (len(install_rpath) - len(paths))
+ store_paths = ':'.join(filter(lambda path: path.startswith('@storeDir@'), paths.split(':')))
+ extra_space_needed = len(install_rpath + (':' if install_rpath and store_paths else '') + store_paths) - len(paths)
+ if extra_space_needed > 0:
+ padding = 'X' * extra_space_needed
if not paths:
paths = padding
else:
--- a/mesonbuild/scripts/depfixer.py --- a/mesonbuild/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py +++ b/mesonbuild/scripts/depfixer.py
@@ -303,6 +303,14 @@ @@ -303,6 +303,14 @@

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

@ -1,6 +1,6 @@
--- a/mesonbuild/modules/gnome.py --- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py
@@ -780,6 +780,13 @@ @@ -805,6 +805,13 @@
scan_command += self._scan_langs(state, [lc[0] for lc in langs_compilers]) scan_command += self._scan_langs(state, [lc[0] for lc in langs_compilers])
scan_command += list(external_ldflags) scan_command += list(external_ldflags)