openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-18 07:24:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to meson-1.5.0.

Browse Source
This commit is contained in:
ajacoutot
2024-07-11 07:03:57 +00:00
parent 5165091686
commit 7e5ba4ab8c
6 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
devel/meson/Makefile
+1 -1
View File
@@ -3,7 +3,7 @@ COMMENT= next-generation build system
MODPY_EGG_VERSION= ${GH_TAGNAME}
GH_ACCOUNT= mesonbuild
GH_PROJECT= meson
GH_TAGNAME= 1.4.1
GH_TAGNAME= 1.5.0
EPOCH= 0
CATEGORIES= devel
devel/meson/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (meson-1.4.1.tar.gz) = p+/HLsuHPFpiAxreGSGnF3tnz9yy6UEKerAj+egZL0s=
SIZE (meson-1.4.1.tar.gz) = 4760421
SHA256 (meson-1.5.0.tar.gz) = eBkTgm+29HjrfXfhlCqz3zlETkyQ6aNSNzfiFRcdtGk=
SIZE (meson-1.5.0.tar.gz) = 4798142
devel/meson/meson.port.mk
+1 -1
View File
@@ -4,7 +4,7 @@
# finding foo.cmake and junking it if cmake is found & used)
DPB_PROPERTIES += noconfigurejunk
BUILD_DEPENDS += devel/meson>=1.4.1v0
BUILD_DEPENDS += devel/meson>=1.5.0v0
SEPARATE_BUILD ?= Yes
.if empty(CONFIGURE_STYLE)
devel/meson/patches/patch-mesonbuild_build_py
+2 -2
View File
@@ -10,7 +10,7 @@ Index: mesonbuild/build.py
MesonBugException, EnvironmentVariables, pickle_load,
)
from .compilers import (
@@ -2357,6 +2357,26 @@ class SharedLibrary(BuildTarget):
@@ -2354,6 +2354,26 @@ class SharedLibrary(BuildTarget):
if self.darwin_versions is None and self.soversion is not None:
# If unspecified, pick the soversion
self.darwin_versions = (self.soversion, self.soversion)
@@ -37,7 +37,7 @@ Index: mesonbuild/build.py
# Visual Studio module-definitions file
self.process_vs_module_defs_kw(kwargs)
@@ -2411,6 +2431,8 @@ class SharedLibrary(BuildTarget):
@@ -2408,6 +2428,8 @@ class SharedLibrary(BuildTarget):
# filename. If ltversion != soversion we create an soversion alias:
# libfoo.so.0 -> libfoo.so.0.100.0
# Where libfoo.so.0.100.0 is the actual library
devel/meson/patches/patch-mesonbuild_dependencies_boost_py
-13
View File
@@ -1,13 +0,0 @@
Index: mesonbuild/dependencies/boost.py
--- mesonbuild/dependencies/boost.py.orig
+++ mesonbuild/dependencies/boost.py
@@ -594,7 +594,8 @@ class BoostDependency(SystemDependency):
# mlog.debug(' - vscrt: {}'.format(vscrt))
libs = [x for x in libs if x.static == self.static or not self.explicit_static]
libs = [x for x in libs if x.mt == self.multithreading]
- libs = [x for x in libs if x.version_matches(lib_vers)]
+ if not mesonlib.is_openbsd():
+ libs = [x for x in libs if x.version_matches(lib_vers)]
libs = [x for x in libs if x.arch_matches(self.arch)]
libs = [x for x in libs if x.vscrt_matches(vscrt)]
libs = [x for x in libs if x.nvsuffix != 'dll'] # Only link to import libraries
devel/meson/pkg/PLIST
+15 -3
View File
@@ -27,6 +27,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}envconfig.${
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}envconfig.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}machinefile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}machinefile.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mcompile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mcompile.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mconf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -41,6 +43,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mesonlib.${M
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mesonlib.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mesonmain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mesonmain.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mformat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}mformat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}minit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}minit.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}minstall.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -61,6 +65,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}munstable_co
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}munstable_coredata.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}optinterpreter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}optinterpreter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}programs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}programs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}rewriter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -238,6 +244,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}apple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}apple.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}arm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}arm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}ccrx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -268,6 +276,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYC
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}visualstudio.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}xc16.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}xc16.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/apple.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/arm.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/ccrx.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/clang.py
@@ -457,6 +466,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/linkers/${MODPY_PYCACHE}link
lib/python${MODPY_VERSION}/site-packages/mesonbuild/linkers/base.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/linkers/detect.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/linkers/linkers.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/machinefile.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mcompile.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mconf.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mdevenv.py
@@ -464,6 +474,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/mdist.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mesondata.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mesonlib.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mesonmain.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mformat.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/minit.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/minstall.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mintro.py
@@ -473,6 +484,8 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}_qt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}_qt.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}cmake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}cmake.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}cuda.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -503,8 +516,6 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}pyth
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}python3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}python3.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}qt.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}qt4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}qt4.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}qt5.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -521,6 +532,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}wayl
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}wayland.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/_qt.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/cmake.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/cuda.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/dlang.py
@@ -536,7 +548,6 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/modtest.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/pkgconfig.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/python.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/python3.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/qt.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/qt4.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/qt5.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/qt6.py
@@ -551,6 +562,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/msubprojects.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/mtest.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/munstable_coredata.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/optinterpreter.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/options.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/programs.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/rewriter.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/