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

Update to meson-0.60.1.

Browse Source
This commit is contained in:
ajacoutot 2021-11-03 06:55:53 +00:00
parent 2611b197ca
commit efc597f2c3
5 changed files with 8 additions and 102 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.99 2021/11/02 00:00:25 sthen Exp $
# $OpenBSD: Makefile,v 1.100 2021/11/03 06:55:53 ajacoutot Exp $
COMMENT= next-generation build system
MODPY_EGG_VERSION= ${GH_TAGNAME}
GH_ACCOUNT= mesonbuild
GH_PROJECT= meson
GH_TAGNAME= 0.60.0
GH_TAGNAME= 0.60.1
EPOCH= 0
REVISION= 0
CATEGORIES= devel

4
devel/meson/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (meson-0.60.0.tar.gz) = VnKlYPxAlMiMpbi+BIfgmf6ENX5QRfWuzxETCEgA5v0=
SIZE (meson-0.60.0.tar.gz) = 4136947
SHA256 (meson-0.60.1.tar.gz) = sG99YhuQ4JS+DqIVf6Q1ZI4GnxkYLY2UAqoDlydlKww=
SIZE (meson-0.60.1.tar.gz) = 4137380

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

@ -1,6 +1,6 @@
# $OpenBSD: meson.port.mk,v 1.69 2021/10/31 07:20:45 ajacoutot Exp $
# $OpenBSD: meson.port.mk,v 1.70 2021/11/03 06:55:53 ajacoutot Exp $
BUILD_DEPENDS += devel/meson>=0.60.0v0
BUILD_DEPENDS += devel/meson>=0.60.1v0
SEPARATE_BUILD ?= Yes
.if empty(CONFIGURE_STYLE)

94
devel/meson/patches/patch-mesonbuild_modules_gnome_py
View File

@ -1,94 +0,0 @@
$OpenBSD: patch-mesonbuild_modules_gnome_py,v 1.8 2021/10/31 07:20:45 ajacoutot Exp $
From ae35b1f45ac5850547f2db52b7b50a54789fcca1 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Wed, 27 Oct 2021 11:02:04 -0700
Subject: [PATCH] modules/gnome: ensure that `install_dir` is set
From b7a3457765409a645686cba70a366ae11b3e9078 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Thu, 28 Oct 2021 10:53:26 -0700
Subject: [PATCH] modules/gnome: fix missing install_dir, again, harder
From c8ea5dfe8adc01c32c6f88dfeed13f15a659929f Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Thu, 28 Oct 2021 11:46:18 -0700
Subject: [PATCH] modules/gnome: use `install_dir = []` instead of false
Index: mesonbuild/modules/gnome.py
--- mesonbuild/modules/gnome.py.orig
+++ mesonbuild/modules/gnome.py
@@ -278,18 +278,20 @@ class GnomeModule(ExtensionModule):
if install_header and not export:
raise MesonException('GResource header is installed yet export is not enabled')
- kwargs['input'] = args[1]
- kwargs['output'] = output
- kwargs['depends'] = depends
+ c_kwargs = kwargs.copy()
+ c_kwargs['input'] = args[1]
+ c_kwargs['output'] = output
+ c_kwargs['depends'] = depends
+ c_kwargs.setdefault('install_dir', [])
if not mesonlib.version_compare(glib_version, gresource_dep_needed_version):
# This will eventually go out of sync if dependencies are added
- kwargs['depend_files'] = depend_files
- kwargs['command'] = cmd
+ c_kwargs['depend_files'] = depend_files
+ c_kwargs['command'] = cmd
else:
depfile = f'{output}.d'
- kwargs['depfile'] = depfile
- kwargs['command'] = copy.copy(cmd) + ['--dependency-file', '@DEPFILE@']
- target_c = GResourceTarget(name, state.subdir, state.subproject, kwargs)
+ c_kwargs['depfile'] = depfile
+ c_kwargs['command'] = copy.copy(cmd) + ['--dependency-file', '@DEPFILE@']
+ target_c = GResourceTarget(name, state.subdir, state.subproject, c_kwargs)
if gresource: # Only one target for .gresource files
return ModuleReturnValue(target_c, [target_c])
@@ -1434,13 +1436,16 @@ class GnomeModule(ExtensionModule):
# so --template consumes it.
h_cmd = cmd + ['--template', '@INPUT@']
h_sources = [h_template] + sources
- custom_kwargs['install'] = install_header
- if 'install_dir' not in custom_kwargs:
- custom_kwargs['install_dir'] = \
+
+ # Copy so we don't mutate the arguments for the c_template
+ h_kwargs = custom_kwargs.copy()
+ h_kwargs['install'] = install_header
+ if 'install_dir' not in h_kwargs:
+ h_kwargs['install_dir'] = \
state.environment.coredata.get_option(mesonlib.OptionKey('includedir'))
h_target = self._make_mkenum_custom_target(state, h_sources,
h_output, h_cmd,
- custom_kwargs)
+ h_kwargs)
targets.append(h_target)
if c_template is not None:
@@ -1449,16 +1454,19 @@ class GnomeModule(ExtensionModule):
# so --template consumes it.
c_cmd = cmd + ['--template', '@INPUT@']
c_sources = [c_template] + sources
+
+ c_kwargs = custom_kwargs.copy()
# Never install the C file. Complain on bug tracker if you need it.
- custom_kwargs['install'] = False
+ c_kwargs['install'] = False
+ c_kwargs['install_dir'] = []
if h_template is not None:
if 'depends' in custom_kwargs:
- custom_kwargs['depends'] += [h_target]
+ c_kwargs['depends'] += [h_target]
else:
- custom_kwargs['depends'] = h_target
+ c_kwargs['depends'] = h_target
c_target = self._make_mkenum_custom_target(state, c_sources,
c_output, c_cmd,
- custom_kwargs)
+ c_kwargs)
targets.insert(0, c_target)
if c_template is None and h_template is None:

3
devel/meson/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.29 2021/10/31 07:20:45 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.30 2021/11/03 06:55:53 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
@ -387,6 +387,7 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/clangformat.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/clangtidy.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/cleantrees.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/cmake_run_ctgt.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/cmd_or_ps.ps1
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/coverage.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/delwithsuffix.py
lib/python${MODPY_VERSION}/site-packages/mesonbuild/scripts/depfixer.py