Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson: update to 1.2.1 (r151038) #3379

Merged
merged 1 commit into from
Oct 17, 2023
Merged

meson: update to 1.2.1 (r151038) #3379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/python39/meson/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
28 changes: 14 additions & 14 deletions build/python39/meson/patches/compiler_def_static_linker.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'''
Expand All @@ -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']
Loading