cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to meson-0.53.0.

Browse Source
This commit is contained in:
ajacoutot 2020-01-14 11:39:41 +00:00
parent 5afb12fc89
commit ecbbefddf1
6 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/meson/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.70 2020/01/07 20:45:17 zhuk Exp $
# $OpenBSD: Makefile,v 1.71 2020/01/14 11:39:41 ajacoutot Exp $
COMMENT= next-generation build system
MODPY_EGG_VERSION= ${GH_TAGNAME}
GH_ACCOUNT= mesonbuild
GH_PROJECT= meson
GH_TAGNAME= 0.52.1
GH_TAGNAME= 0.53.0
EPOCH= 0
REVISION= 0
CATEGORIES= devel

4
devel/meson/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (meson-0.52.1.tar.gz) = rY261h1MIst9doyx+KIStKvw8/vBfCmNgWFA7Nn10d8=
SIZE (meson-0.52.1.tar.gz) = 2119805
SHA256 (meson-0.53.0.tar.gz) = zBX0FtC1OPsHnBWlnuLNEGiVyhFfpdZUcxppXIXJkvw=
SIZE (meson-0.53.0.tar.gz) = 2169545

4
devel/meson/meson.port.mk
View File

@ -1,6 +1,6 @@
# $OpenBSD: meson.port.mk,v 1.45 2019/12/10 16:45:24 ajacoutot Exp $
# $OpenBSD: meson.port.mk,v 1.46 2020/01/14 11:39:41 ajacoutot Exp $
BUILD_DEPENDS += devel/meson>=0.52.1v0
BUILD_DEPENDS += devel/meson>=0.53.0v0
SEPARATE_BUILD ?= Yes
.if empty(CONFIGURE_STYLE)

6
devel/meson/patches/patch-mesonbuild_build_py
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-mesonbuild_build_py,v 1.16 2019/11/08 07:46:31 ajacoutot Exp $
$OpenBSD: patch-mesonbuild_build_py,v 1.17 2020/01/14 11:39:41 ajacoutot Exp $
Index: mesonbuild/build.py
--- mesonbuild/build.py.orig
@ -12,7 +12,7 @@ Index: mesonbuild/build.py
)
from .compilers import Compiler, is_object, clink_langs, sort_clink, lang_suffixes
from .linkers import StaticLinker
@@ -1826,6 +1826,21 @@ class SharedLibrary(BuildTarget):
@@ -1871,6 +1871,21 @@ class SharedLibrary(BuildTarget):
elif self.soversion:
# If unspecified, pick the soversion
self.darwin_versions = 2 * [self.soversion]
@ -34,7 +34,7 @@ Index: mesonbuild/build.py
# Visual Studio module-definitions file
if 'vs_module_defs' in kwargs:
@@ -1891,6 +1906,8 @@ class SharedLibrary(BuildTarget):
@@ -1944,6 +1959,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

23
devel/meson/patches/patch-mesonbuild_compilers_compilers_py
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-mesonbuild_compilers_compilers_py,v 1.15 2019/11/28 19:46:58 ajacoutot Exp $
From 0241948d8fa37f59eb93088a26e9b7ae642cc2d0 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@openbsd.org>
Date: Mon, 25 Nov 2019 11:54:07 +0100
Subject: [PATCH] openbsd: execinfo is not a compiler lib
Index: mesonbuild/compilers/compilers.py
--- mesonbuild/compilers/compilers.py.orig
+++ mesonbuild/compilers/compilers.py
@@ -87,8 +87,10 @@ cflags_mapping = {'c': 'CFLAGS',
'vala': 'VALAFLAGS',
'rust': 'RUSTFLAGS'}
-# execinfo is a compiler lib on BSD
-unixy_compiler_internal_libs = ('m', 'c', 'pthread', 'dl', 'rt', 'execinfo')
+unixy_compiler_internal_libs = ('m', 'c', 'pthread', 'dl', 'rt')
+# execinfo is a compiler lib on FreeBSD and NetBSD
+if mesonlib.is_freebsd() or mesonlib.is_netbsd():
+ unixy_compiler_internal_libs += ('execinfo',)
# All these are only for C-linkable languages; see `clink_langs` above.

36
devel/meson/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2020/01/07 20:45:17 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.20 2020/01/14 11:39:41 ajacoutot Exp $
bin/meson
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@ -74,6 +74,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/${MODPY_PYCACHE}__init
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/${MODPY_PYCACHE}executor.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/${MODPY_PYCACHE}fileapi.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/${MODPY_PYCACHE}generator.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/${MODPY_PYCACHE}interpreter.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/${MODPY_PYCACHE}traceparser.${MODPY_PYC_MAGIC_TAG}pyc
@ -84,6 +85,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/data/$
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/data/${MODPY_PYCACHE}run_ctgt.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/data/run_ctgt.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/executor.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/fileapi.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/generator.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/interpreter.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/cmake/traceparser.py
@ -123,6 +125,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYC
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}clang.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}clike.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}elbrus.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}emscripten.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}gnu.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}intel.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/${MODPY_PYCACHE}islinker.${MODPY_PYC_MAGIC_TAG}pyc
@ -133,6 +136,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/ccrx.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/clang.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/clike.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/elbrus.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/emscripten.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/gnu.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/intel.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/mixins/islinker.py
@ -150,19 +154,29 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}boost.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}coarrays.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}cuda.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}dev.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}hdf5.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}mpi.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}platform.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}scalapack.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/base.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/boost.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/coarrays.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/cuda.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/data/
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/data/CMakeLists.txt
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/data/CMakeListsLLVM.txt
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/data/CMakePathInfo.txt
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/dev.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/hdf5.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/misc.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/mpi.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/platform.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/scalapack.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/dependencies/ui.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/depfile.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/envconfig.py
@ -184,6 +198,7 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MO
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}cmake.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}dlang.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}fs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}gnome.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}hotdoc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}pyc
@ -203,6 +218,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}unst
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/cmake.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/dlang.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/fs.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/gnome.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/hotdoc.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/i18n.py
@ -247,6 +263,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}msgf
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}regen_checker.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}scanbuild.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}symbolextractor.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}tags.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}uninstall.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}vcstagger.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}yelphelper.${MODPY_PYC_MAGIC_TAG}pyc
@ -266,9 +283,26 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/msgfmthelper.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/regen_checker.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/scanbuild.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/symbolextractor.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/tags.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/uninstall.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/vcstagger.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/yelphelper.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/${MODPY_PYCACHE}cpptemplates.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/${MODPY_PYCACHE}ctemplates.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/${MODPY_PYCACHE}dlangtemplates.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/${MODPY_PYCACHE}fortrantemplates.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/${MODPY_PYCACHE}objctemplates.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/${MODPY_PYCACHE}rusttemplates.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/cpptemplates.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/ctemplates.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/dlangtemplates.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/fortrantemplates.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/objctemplates.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/templates/rusttemplates.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/wrap/
lib/python${MODPY_VERSION}/site-packages/mesonbuild/wrap/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mesonbuild/wrap/${MODPY_PYCACHE}/