Update to meson-0.50.1.
This commit is contained in:
ajacoutot
parent
de6e0a5758
commit
e9b85184ce
@ -1,13 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.58 2019/04/16 08:13:52 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.59 2019/04/18 09:55:15 ajacoutot Exp $
|
||||
|
||||
COMMENT= next-generation build system
|
||||
|
||||
MODPY_EGG_VERSION= ${GH_TAGNAME}
|
||||
GH_ACCOUNT= mesonbuild
|
||||
GH_PROJECT= meson
|
||||
GH_TAGNAME= 0.50.0
|
||||
GH_TAGNAME= 0.50.1
|
||||
EPOCH= 0
|
||||
REVISION= 0
|
||||
|
||||
CATEGORIES= devel
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (meson-0.50.0.tar.gz) = ovQly5EzxDs1107miuVaU/G6pyej/N3xxmT0YkV4GgU=
|
||||
SIZE (meson-0.50.0.tar.gz) = 1973016
|
||||
SHA256 (meson-0.50.1.tar.gz) = 6fUgR/JmNu5RJDnAF1UGRlbbX67N1o6a8J3HctgpGYw=
|
||||
SIZE (meson-0.50.1.tar.gz) = 1975299
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# $OpenBSD: meson.port.mk,v 1.37 2019/04/16 07:56:26 ajacoutot Exp $
|
||||
# $OpenBSD: meson.port.mk,v 1.38 2019/04/18 09:55:15 ajacoutot Exp $
|
||||
|
||||
BUILD_DEPENDS += devel/meson>=0.50.0p0v0
|
||||
BUILD_DEPENDS += devel/meson>=0.50.1v0
|
||||
SEPARATE_BUILD ?= Yes
|
||||
|
||||
.if empty(CONFIGURE_STYLE)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-mesonbuild_compilers_c_py,v 1.3 2019/03/11 16:08:26 ajacoutot Exp $
|
||||
$OpenBSD: patch-mesonbuild_compilers_c_py,v 1.4 2019/04/18 09:55:15 ajacoutot Exp $
|
||||
|
||||
From 03c0c3a8f41e7d9eaff582dbdf680154671a6263 Mon Sep 17 00:00:00 2001
|
||||
From: Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH] Fix _get_patterns on OpenBSD
|
||||
Index: mesonbuild/compilers/c.py
|
||||
--- mesonbuild/compilers/c.py.orig
|
||||
+++ mesonbuild/compilers/c.py
|
||||
@@ -902,7 +902,8 @@ class CCompiler(Compiler):
|
||||
@@ -904,7 +904,8 @@ class CCompiler(Compiler):
|
||||
# is expensive. It's wrong in many edge cases, but it will match
|
||||
# correctly-named libraries and hopefully no one on OpenBSD names
|
||||
# their files libfoo.so.9a.7b.1.0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-mesonbuild_compilers_compilers_py,v 1.11 2019/03/11 16:08:26 ajacoutot Exp $
|
||||
$OpenBSD: patch-mesonbuild_compilers_compilers_py,v 1.12 2019/04/18 09:55:15 ajacoutot Exp $
|
||||
|
||||
From d952e5ac4d5dee037df80633ceedbad1bfc8eabb Mon Sep 17 00:00:00 2001
|
||||
From: Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
@ -13,7 +13,7 @@ Subject: [PATCH] Fix indent to please codestyle.
|
||||
Index: mesonbuild/compilers/compilers.py
|
||||
--- mesonbuild/compilers/compilers.py.orig
|
||||
+++ mesonbuild/compilers/compilers.py
|
||||
@@ -1485,7 +1485,9 @@ class GnuLikeCompiler(abc.ABC):
|
||||
@@ -1491,7 +1491,9 @@ class GnuLikeCompiler(abc.ABC):
|
||||
self.compiler_type = compiler_type
|
||||
self.base_options = ['b_pch', 'b_lto', 'b_pgo', 'b_sanitize', 'b_coverage',
|
||||
'b_ndebug', 'b_staticpic', 'b_pie']
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
$OpenBSD: patch-mesonbuild_environment_py,v 1.7 2019/04/02 12:57:23 ajacoutot Exp $
|
||||
|
||||
From 663517d23376809fd6bc0b69549ee823a06682d7 Mon Sep 17 00:00:00 2001
|
||||
From: Janne Grunau <j@jannau.net>
|
||||
Date: Mon, 1 Apr 2019 21:22:32 +0200
|
||||
Subject: [PATCH] detect 'arm64' as aarch64 CPU family
|
||||
|
||||
From 7bc04996c0d98797be1516643b833f2206e61151 Mon Sep 17 00:00:00 2001
|
||||
From: Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
Date: Mon, 11 Mar 2019 10:26:14 +0100
|
||||
Subject: [PATCH] environment: support OpenBSD in detect_objc_compiler
|
||||
|
||||
Index: mesonbuild/environment.py
|
||||
--- mesonbuild/environment.py.orig
|
||||
+++ mesonbuild/environment.py
|
||||
@@ -204,6 +204,9 @@ def detect_cpu_family(compilers):
|
||||
trial = platform.machine().lower()
|
||||
if trial.startswith('i') and trial.endswith('86'):
|
||||
trial = 'x86'
|
||||
+ # OpenBSD's 64 bit arm architecute identifies as 'arm64'
|
||||
+ elif trial == 'arm64':
|
||||
+ trial = 'aarch64'
|
||||
elif trial.startswith('arm'):
|
||||
trial = 'arm'
|
||||
elif trial.startswith('ppc64'):
|
||||
@@ -888,7 +891,7 @@ class Environment:
|
||||
return GnuObjCCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines)
|
||||
if out.startswith('Apple LLVM'):
|
||||
return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap)
|
||||
- if out.startswith('clang'):
|
||||
+ if out.startswith(('clang', 'OpenBSD clang')):
|
||||
return ClangObjCCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap)
|
||||
self._handle_exceptions(popen_exceptions, compilers)
|
||||
|
||||
@@ -915,7 +918,7 @@ class Environment:
|
||||
return GnuObjCPPCompiler(ccache + compiler, version, compiler_type, is_cross, exe_wrap, defines)
|
||||
if out.startswith('Apple LLVM'):
|
||||
return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_OSX, is_cross, exe_wrap)
|
||||
- if out.startswith('clang'):
|
||||
+ if out.startswith(('clang', 'OpenBSD clang')):
|
||||
return ClangObjCPPCompiler(ccache + compiler, version, CompilerType.CLANG_STANDARD, is_cross, exe_wrap)
|
||||
self._handle_exceptions(popen_exceptions, compilers)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-run_unittests_py,v 1.9 2019/04/04 09:28:42 ajacoutot Exp $
|
||||
$OpenBSD: patch-run_unittests_py,v 1.10 2019/04/18 09:55:15 ajacoutot Exp $
|
||||
|
||||
XXX Our pkg-config(1) output differs from GNU
|
||||
|
||||
@ -12,16 +12,6 @@ From: Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
Date: Sun, 10 Mar 2019 14:37:25 +0100
|
||||
Subject: [PATCH] Fix unit test: test_find_library_patterns
|
||||
|
||||
From f7af1a628514d4f0ab061db449a30b3079f59834 Mon Sep 17 00:00:00 2001
|
||||
From: Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
Date: Tue, 12 Mar 2019 19:03:54 +0100
|
||||
Subject: [PATCH] compilers: -fsanitize is not supported on OpenBSD
|
||||
|
||||
From 5d3e20984dadefb122e9e4fae584b40d936844e8 Mon Sep 17 00:00:00 2001
|
||||
From: Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
Date: Wed, 13 Mar 2019 09:36:05 +0100
|
||||
Subject: [PATCH] compilers: -fsanitize is not supported on OpenBSD (second pass)
|
||||
|
||||
Index: run_unittests.py
|
||||
--- run_unittests.py.orig
|
||||
+++ run_unittests.py
|
||||
@ -54,7 +44,7 @@ Index: run_unittests.py
|
||||
self._test_all_naming(cc, env, patterns, 'openbsd')
|
||||
with PatchModule(mesonbuild.compilers.c.for_darwin,
|
||||
'mesonbuild.compilers.c.for_darwin', true):
|
||||
@@ -4164,11 +4162,11 @@ class LinuxlikeTests(BasePlatformTests):
|
||||
@@ -4170,11 +4168,11 @@ class LinuxlikeTests(BasePlatformTests):
|
||||
|
||||
cmd = ['pkg-config', 'requires-test']
|
||||
out = self._run(cmd + ['--print-requires']).strip().split('\n')
|
||||
@ -68,25 +58,7 @@ Index: run_unittests.py
|
||||
|
||||
def test_pkg_unfound(self):
|
||||
testdir = os.path.join(self.unit_test_dir, '23 unfound pkgconfig')
|
||||
@@ -4237,6 +4235,8 @@ class LinuxlikeTests(BasePlatformTests):
|
||||
def test_generate_gir_with_address_sanitizer(self):
|
||||
if is_cygwin():
|
||||
raise unittest.SkipTest('asan not available on Cygwin')
|
||||
+ if is_openbsd():
|
||||
+ raise unittest.SkipTest('-fsanitize=address is not supported on OpenBSD')
|
||||
|
||||
testdir = os.path.join(self.framework_test_dir, '7 gnome')
|
||||
self.init(testdir, ['-Db_sanitize=address', '-Db_lundef=false'])
|
||||
@@ -4702,6 +4702,8 @@ class LinuxlikeTests(BasePlatformTests):
|
||||
def test_pch_with_address_sanitizer(self):
|
||||
if is_cygwin():
|
||||
raise unittest.SkipTest('asan not available on Cygwin')
|
||||
+ if is_openbsd():
|
||||
+ raise unittest.SkipTest('-fsanitize=address is not supported on OpenBSD')
|
||||
|
||||
testdir = os.path.join(self.common_test_dir, '13 pch')
|
||||
self.init(testdir, ['-Db_sanitize=address'])
|
||||
@@ -4852,7 +4854,7 @@ endian = 'little'
|
||||
@@ -4879,7 +4877,7 @@ endian = 'little'
|
||||
myenv['PKG_CONFIG_PATH'] = self.privatedir
|
||||
stdo = subprocess.check_output(['pkg-config', '--libs-only-l', 'libsomething'], env=myenv)
|
||||
deps = [b'-lgobject-2.0', b'-lgio-2.0', b'-lglib-2.0', b'-lsomething']
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
$OpenBSD: patch-test_cases_common_137_get_define_meson_build,v 1.2 2019/03/11 16:08:26 ajacoutot Exp $
|
||||
|
||||
From 85ca6adfb46da24254073d69a2ffeadd879973fa Mon Sep 17 00:00:00 2001
|
||||
From: Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
Date: Mon, 11 Mar 2019 12:33:40 +0100
|
||||
Subject: [PATCH] test: fix "get define" on OpenBSD
|
||||
|
||||
Index: test cases/common/137 get define/meson.build
|
||||
--- "test cases/common/137 get define/meson.build.orig"
|
||||
+++ "test cases/common/137 get define/meson.build"
|
||||
@@ -32,6 +32,9 @@ foreach lang : ['c', 'cpp']
|
||||
elif host_system == 'netbsd'
|
||||
d = cc.get_define('__NetBSD__')
|
||||
assert(d == '1', '__NetBSD__ value is @0@ instead of 1'.format(d))
|
||||
+ elif host_system == 'openbsd'
|
||||
+ d = cc.get_define('__OpenBSD__')
|
||||
+ assert(d == '1', '__OpenBSD__ value is @0@ instead of 1'.format(d))
|
||||
elif host_system == 'gnu'
|
||||
d = cc.get_define('__GNU__')
|
||||
assert(d == '1', '__GNU__ value is @0@ instead of 1'.format(d))
|
||||
@@ -44,10 +47,10 @@ foreach lang : ['c', 'cpp']
|
||||
# found in the compiler's default search path, GCC inserts an extra comment
|
||||
# between the delimiter and the define which causes a parsing error.
|
||||
# https://github.com/mesonbuild/meson/issues/1726
|
||||
- if host_machine.system() == 'netbsd'
|
||||
- # NetBSD's zlib doesn't is version 1.2.3 and doesn't have a
|
||||
- # ZLIB_VER_MAJOR, but it does have a ZLIB_VERSION (which is a string), so
|
||||
- # check the first non-quote character of that.
|
||||
+ if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
|
||||
+ # NetBSD and OpenBSD's zlib don't have a ZLIB_VER_MAJOR, but they do have
|
||||
+ # a ZLIB_VERSION (which is a string), so check the first non-quote
|
||||
+ # character of that.
|
||||
ver = cc.get_define('ZLIB_VERSION', prefix : '#include <zlib.h>')[1]
|
||||
assert(ver == '1', 'ZLIB_VERSION (major) value is "@0@" instead of "1"'.format(ver))
|
||||
else
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.15 2019/03/11 16:08:26 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.16 2019/04/18 09:55:15 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
|
||||
@ -54,12 +54,14 @@ lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/${MODPY_PYCACHE}ninj
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/${MODPY_PYCACHE}vs2010backend.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/${MODPY_PYCACHE}vs2015backend.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/${MODPY_PYCACHE}vs2017backend.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/${MODPY_PYCACHE}vs2019backend.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/${MODPY_PYCACHE}xcodebackend.${MODPY_PYC_MAGIC_TAG}pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/backends.py
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/ninjabackend.py
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/vs2010backend.py
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/vs2015backend.py
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/vs2017backend.py
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/vs2019backend.py
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/backend/xcodebackend.py
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/build.py
|
||||
lib/python${MODPY_VERSION}/site-packages/mesonbuild/compilers/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user