meson: update to 1.2.1

omniosorg · Oct 15, 2023 · bbb19e6 · bbb19e6
1 parent 080e6c8
commit bbb19e6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/build/python39/meson/build.sh b/build/python39/meson/build.sh
@@ -12,13 +12,13 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 #
-# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../../lib/functions.sh
 
 PKG=library/python-3/meson-39
 PROG=meson
-VER=0.57.1
+VER=1.2.1
 SUMMARY="The Meson Build system"
 DESC="An open source build system meant to be both extremely fast, "
 DESC+="and, even more importantly, as user friendly as possible"

diff --git a/build/python39/meson/patches/compiler_def_static_linker.patch b/build/python39/meson/patches/compiler_def_static_linker.patch
@@ -1,7 +1,7 @@
-diff -wpruN '--exclude=*.orig' a~/mesonbuild/compilers/compilers.py a/mesonbuild/compilers/compilers.py
+diff -wpruN --no-dereference '--exclude=*.orig' a~/mesonbuild/compilers/compilers.py a/mesonbuild/compilers/compilers.py
 --- a~/mesonbuild/compilers/compilers.py	1970-01-01 00:00:00
 +++ a/mesonbuild/compilers/compilers.py	1970-01-01 00:00:00
-@@ -1025,7 +1025,7 @@ class Compiler(metaclass=abc.ABCMeta):
+@@ -1115,7 +1115,7 @@ class Compiler(HoldableObject, metaclass
 
      def get_largefile_args(self) -> T.List[str]:
          '''Enable transparent large-file-support for 32-bit UNIX systems'''
@@ -10,15 +10,15 @@ diff -wpruN '--exclude=*.orig' a~/mesonbuild/compilers/compilers.py a/mesonbuild
              # Enable large-file support unconditionally on all platforms other
              # than macOS and MSVC. macOS is now 64-bit-only so it doesn't
              # need anything special, and MSVC doesn't have automatic LFS.
-diff -wpruN '--exclude=*.orig' a~/mesonbuild/environment.py a/mesonbuild/environment.py
---- a~/mesonbuild/environment.py	1970-01-01 00:00:00
-+++ a/mesonbuild/environment.py	1970-01-01 00:00:00
-@@ -735,7 +735,7 @@ class Environment:
-         self.default_rust = ['rustc']
-         self.default_swift = ['swiftc']
-         self.default_vala = ['valac']
--        self.default_static_linker = ['ar', 'gar']
-+        self.default_static_linker = ['gar', 'ar']
-         self.default_strip = ['strip']
-         self.vs_static_linker = ['lib']
-         self.clang_cl_static_linker = ['llvm-lib']
+diff -wpruN --no-dereference '--exclude=*.orig' a~/mesonbuild/linkers/detect.py a/mesonbuild/linkers/detect.py
+--- a~/mesonbuild/linkers/detect.py	1970-01-01 00:00:00
++++ a/mesonbuild/linkers/detect.py	1970-01-01 00:00:00
+@@ -31,7 +31,7 @@ if T.TYPE_CHECKING:
+     from ..mesonlib import MachineChoice
+
+ defaults: T.Dict[str, T.List[str]] = {}
+-defaults['static_linker'] = ['ar', 'gar']
++defaults['static_linker'] = ['gar', 'ar']
+ defaults['vs_static_linker'] = ['lib']
+ defaults['clang_cl_static_linker'] = ['llvm-lib']
+ defaults['cuda_static_linker'] = ['nvlink']