Update to meson-0.46.1 again, now that our pkjg-config(1) as been fixed.
This commit is contained in:
ajacoutot
parent
bf4a0127dc
commit
44ff6026a7
@ -1,13 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.30 2018/05/17 20:09:16 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2018/05/20 07:26:03 ajacoutot Exp $
|
||||
|
||||
COMMENT= next-generation build system
|
||||
|
||||
MODPY_EGG_VERSION= ${GH_TAGNAME}
|
||||
GH_ACCOUNT= mesonbuild
|
||||
GH_PROJECT= meson
|
||||
GH_TAGNAME= 0.46.0
|
||||
GH_TAGNAME= 0.46.1
|
||||
EPOCH= 0
|
||||
REVISION= 1
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (meson-0.46.0.tar.gz) = JMYJiJH7qrcPQ66eUeCrmeADwU/qcBBPP3G7L7SaPnE=
|
||||
SIZE (meson-0.46.0.tar.gz) = 1443130
|
||||
SHA256 (meson-0.46.1.tar.gz) = LZF2ktLMGU4SKV8ARp+988BF6F0CleXlnO1pEVkg/6A=
|
||||
SIZE (meson-0.46.1.tar.gz) = 1447322
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $OpenBSD: meson.port.mk,v 1.23 2018/05/17 20:09:16 ajacoutot Exp $
|
||||
# $OpenBSD: meson.port.mk,v 1.24 2018/05/20 07:26:03 ajacoutot Exp $
|
||||
|
||||
BUILD_DEPENDS += devel/meson>=0.46.0v0
|
||||
BUILD_DEPENDS += devel/meson>=0.46.1v0
|
||||
SEPARATE_BUILD ?= Yes
|
||||
|
||||
MODMESON_WANTCOLOR ?= No
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-mesonbuild_build_py,v 1.9 2018/05/17 20:09:16 ajacoutot Exp $
|
||||
$OpenBSD: patch-mesonbuild_build_py,v 1.10 2018/05/20 07:26:04 ajacoutot Exp $
|
||||
|
||||
Index: mesonbuild/build.py
|
||||
--- mesonbuild/build.py.orig
|
||||
@ -12,7 +12,7 @@ Index: mesonbuild/build.py
|
||||
from .mesonlib import typeslistify, stringlistify, classify_unity_sources
|
||||
from .mesonlib import get_filenames_templates_dict, substitute_values
|
||||
from .mesonlib import for_windows, for_darwin, for_cygwin, for_android, has_path_sep
|
||||
@@ -1497,6 +1497,21 @@ class SharedLibrary(BuildTarget):
|
||||
@@ -1503,6 +1503,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]
|
||||
@ -34,7 +34,7 @@ Index: mesonbuild/build.py
|
||||
# Visual Studio module-definitions file
|
||||
if 'vs_module_defs' in kwargs:
|
||||
path = kwargs['vs_module_defs']
|
||||
@@ -1561,6 +1576,8 @@ class SharedLibrary(BuildTarget):
|
||||
@@ -1567,6 +1582,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
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-mesonbuild_compilers_compilers_py,v 1.6 2018/05/17 20:09:16 ajacoutot Exp $
|
||||
|
||||
From e7218ae0ec92ac57dda4b9b572b24a9e39ba4b74 Mon Sep 17 00:00:00 2001
|
||||
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
|
||||
Date: Fri, 4 May 2018 21:51:59 +0200
|
||||
Subject: [PATCH] add linker flag to handle $ORIGIN on OpenBSD
|
||||
|
||||
Index: mesonbuild/compilers/compilers.py
|
||||
--- mesonbuild/compilers/compilers.py.orig
|
||||
+++ mesonbuild/compilers/compilers.py
|
||||
@@ -909,10 +909,10 @@ class Compiler:
|
||||
else:
|
||||
paths = paths + ':' + padding
|
||||
args = []
|
||||
- if mesonlib.is_dragonflybsd():
|
||||
+ if mesonlib.is_dragonflybsd() or mesonlib.is_openbsd():
|
||||
# This argument instructs the compiler to record the value of
|
||||
# ORIGIN in the .dynamic section of the elf. On Linux this is done
|
||||
- # by default, but is not on dragonfly for some reason. Without this
|
||||
+ # by default, but is not on dragonfly/openbsd for some reason. Without this
|
||||
# $ORIGIN in the runtime path will be undefined and any binaries
|
||||
# linked against local libraries will fail to resolve them.
|
||||
args.append('-Wl,-z,origin')
|
||||
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-mesonbuild_mesonlib_py,v 1.9 2018/05/17 20:09:16 ajacoutot Exp $
|
||||
|
||||
From e7218ae0ec92ac57dda4b9b572b24a9e39ba4b74 Mon Sep 17 00:00:00 2001
|
||||
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
|
||||
Date: Fri, 4 May 2018 21:51:59 +0200
|
||||
Subject: [PATCH] add linker flag to handle $ORIGIN on OpenBSD
|
||||
|
||||
Index: mesonbuild/mesonlib.py
|
||||
--- mesonbuild/mesonlib.py.orig
|
||||
+++ mesonbuild/mesonlib.py
|
||||
@@ -308,6 +308,9 @@ def is_android():
|
||||
def is_haiku():
|
||||
return platform.system().lower() == 'haiku'
|
||||
|
||||
+def is_openbsd():
|
||||
+ return platform.system().lower() == 'openbsd'
|
||||
+
|
||||
def is_windows():
|
||||
platname = platform.system().lower()
|
||||
return platname == 'windows' or 'mingw' in platname
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-mesonbuild_modules_gnome_py,v 1.3 2018/05/17 20:09:16 ajacoutot Exp $
|
||||
$OpenBSD: patch-mesonbuild_modules_gnome_py,v 1.4 2018/05/20 07:26:04 ajacoutot Exp $
|
||||
|
||||
https://github.com/mesonbuild/meson/pull/3463
|
||||
|
||||
@ -138,7 +138,7 @@ Index: mesonbuild/modules/gnome.py
|
||||
|
||||
scankwargs = {'output': girfile,
|
||||
'command': scan_command,
|
||||
@@ -825,7 +834,8 @@ This will become a hard error in the future.''')
|
||||
@@ -827,7 +836,8 @@ This will become a hard error in the future.''')
|
||||
def _get_build_args(self, kwargs, state):
|
||||
args = []
|
||||
deps = extract_as_list(kwargs, 'dependencies', unholder=True)
|
||||
@ -148,7 +148,7 @@ Index: mesonbuild/modules/gnome.py
|
||||
inc_dirs = mesonlib.extract_as_list(kwargs, 'include_directories')
|
||||
for incd in inc_dirs:
|
||||
if not isinstance(incd.held_object, (str, build.IncludeDirs)):
|
||||
@@ -833,7 +843,10 @@ This will become a hard error in the future.''')
|
||||
@@ -835,7 +845,10 @@ This will become a hard error in the future.''')
|
||||
'Gir include dirs should be include_directories().')
|
||||
cflags.update(get_include_args(inc_dirs))
|
||||
cflags.update(state.environment.coredata.external_args['c'])
|
||||
|
||||
Loading…
Reference in New Issue
Block a user