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

Update to meson-0.48.0.

Browse Source 
- passed a bulk build
This commit is contained in:
ajacoutot 2018-09-25 06:51:44 +00:00
parent 0ae902c86c
commit 06c7b69b08
6 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/meson/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.34 2018/08/27 07:37:09 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.35 2018/09/25 06:51:44 ajacoutot Exp $
COMMENT= next-generation build system
MODPY_EGG_VERSION= ${GH_TAGNAME}
GH_ACCOUNT= mesonbuild
GH_PROJECT= meson
GH_TAGNAME= 0.47.2
GH_TAGNAME= 0.48.0
EPOCH= 0
CATEGORIES= devel
@ -19,6 +19,7 @@ PERMIT_PACKAGE_CDROM= Yes
MODULES= lang/python
MODPY_SETUPTOOLS= Yes
MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
RUN_DEPENDS= devel/ninja

4
devel/meson/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (meson-0.47.2.tar.gz) = aeJR3BaeguPTI1ZDyHMWd2TWMCBRXZyoN+qV/wIfLIM=
SIZE (meson-0.47.2.tar.gz) = 1813225
SHA256 (meson-0.48.0.tar.gz) = nele/0V3qbKyWL3velRNo/f+2rlKwuq8a6z80R6k4H4=
SIZE (meson-0.48.0.tar.gz) = 1855941

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

@ -1,6 +1,6 @@
# $OpenBSD: meson.port.mk,v 1.27 2018/08/27 07:37:09 ajacoutot Exp $
# $OpenBSD: meson.port.mk,v 1.28 2018/09/25 06:51:44 ajacoutot Exp $
BUILD_DEPENDS += devel/meson>=0.47.2v0
BUILD_DEPENDS += devel/meson>=0.48.0v0
SEPARATE_BUILD ?= Yes
MODMESON_WANTCOLOR ?= No

10
devel/meson/patches/patch-mesonbuild_backend_ninjabackend_py → devel/meson/patches/patch-mesonbuild_backend_backends_py
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-mesonbuild_backend_ninjabackend_py,v 1.8 2018/07/11 11:51:15 ajacoutot Exp $
$OpenBSD: patch-mesonbuild_backend_backends_py,v 1.1 2018/09/25 06:51:44 ajacoutot Exp $
Do not install compressed manpages.
Index: mesonbuild/backend/ninjabackend.py
--- mesonbuild/backend/ninjabackend.py.orig
+++ mesonbuild/backend/ninjabackend.py
@@ -866,7 +866,7 @@ int dummy;
Index: mesonbuild/backend/backends.py
--- mesonbuild/backend/backends.py.orig
+++ mesonbuild/backend/backends.py
@@ -1133,7 +1133,7 @@ class Backend:
if subdir is None:
subdir = os.path.join(manroot, 'man' + num)
srcabs = f.absolute_path(self.environment.get_source_dir(), self.environment.get_build_dir())

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

@ -1,21 +1,21 @@
$OpenBSD: patch-mesonbuild_build_py,v 1.11 2018/07/10 12:29:16 ajacoutot Exp $
$OpenBSD: patch-mesonbuild_build_py,v 1.12 2018/09/25 06:51:44 ajacoutot Exp $
Index: mesonbuild/build.py
--- mesonbuild/build.py.orig
+++ mesonbuild/build.py
@@ -20,7 +20,7 @@ import pickle
from . import environment
from . import dependencies
@@ -23,7 +23,7 @@ from . import dependencies
from . import mlog
-from .mesonlib import File, MesonException, listify, extract_as_list
+from .mesonlib import File, MesonException, listify, extract_as_list, is_openbsd
from .mesonlib import File, MesonException, listify, extract_as_list, OrderedSet
from .mesonlib import typeslistify, stringlistify, classify_unity_sources
from .mesonlib import get_filenames_templates_dict, substitute_values
-from .mesonlib import get_filenames_templates_dict, substitute_values
+from .mesonlib import get_filenames_templates_dict, substitute_values, is_openbsd
from .mesonlib import for_windows, for_darwin, for_cygwin, for_android, has_path_sep
@@ -1527,6 +1527,21 @@ class SharedLibrary(BuildTarget):
# We replicate what Autotools does here and take the first
# number of the version by default.
self.soversion = self.ltversion.split('.')[0]
from .compilers import is_object, clink_langs, sort_clink, lang_suffixes
from .interpreterbase import FeatureNew
@@ -1605,6 +1605,21 @@ class SharedLibrary(BuildTarget):
elif self.soversion:
# If unspecified, pick the soversion
self.darwin_versions = 2 * [self.soversion]
+ if is_openbsd():
+ self.libversion = os.getenv('LIB' + self.name + '_VERSION')
+ if self.libversion is not None:
@ -30,11 +30,11 @@ Index: mesonbuild/build.py
+ f = open(shared_libs_log, 'a')
+ f.write("SHARED_LIBS += {:<25} {} # {}\n".format(self.name, \
+ self.soversion, self.ltversion_orig))
+ f.close
+ f.close
# Visual Studio module-definitions file
if 'vs_module_defs' in kwargs:
path = kwargs['vs_module_defs']
@@ -1591,6 +1606,8 @@ class SharedLibrary(BuildTarget):
@@ -1670,6 +1685,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

25
devel/meson/pkg/PLIST
View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST,v 1.12 2018/07/10 12:29:16 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.13 2018/09/25 06:51:44 ajacoutot Exp $
bin/meson
bin/mesonconf
bin/mesonintrospect
bin/mesontest
bin/wraptool
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/
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
lib/python${MODPY_VERSION}/site-packages/meson-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/mesonbuild/
lib/python${MODPY_VERSION}/site-packages/mesonbuild/__init__.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/${MODPY_PYCACHE}/
@ -50,6 +51,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/__init__.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/${MODPY_PYCACHE}c.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/${MODPY_PYCACHE}c_function_attributes.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/${MODPY_PYCACHE}compilers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/${MODPY_PYCACHE}cpp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/${MODPY_PYCACHE}cs.${MODPY_PYC_MAGIC_TAG}pyc
@ -62,6 +64,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/${MODPY_PYCACHE}ru
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/${MODPY_PYCACHE}swift.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/${MODPY_PYCACHE}vala.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/c.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/c_function_attributes.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/compilers.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/cpp.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/cs.py
@ -105,7 +108,9 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/__init__.py
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}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}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
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}modtest.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}pkgconfig.${MODPY_PYC_MAGIC_TAG}pyc
@ -118,7 +123,9 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}rpm.
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}unstable_icestorm.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}unstable_simd.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/dlang.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
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/modtest.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/modules/pkgconfig.py
@ -148,6 +155,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}dirc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}dist.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}gettext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}gtkdochelper.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}hotdochelper.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}meson_exe.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}msgfmthelper.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/${MODPY_PYCACHE}regen_checker.${MODPY_PYC_MAGIC_TAG}pyc
@ -165,6 +173,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/dirchanger.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/dist.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/gettext.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/gtkdochelper.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/hotdochelper.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/meson_exe.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/msgfmthelper.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/regen_checker.py
@ -182,10 +191,6 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/wrap/${MODPY_PYCACHE}wraptoo
lib/python${MODPY_VERSION}/site-packages/mesonbuild/wrap/wrap.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/wrap/wraptool.py
@man man/man1/meson.1
@man man/man1/mesonconf.1
@man man/man1/mesonintrospect.1
@man man/man1/mesontest.1
@man man/man1/wraptool.1
share/polkit-1/
share/polkit-1/actions/
share/polkit-1/actions/com.mesonbuild.install.policy