pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/py-meson Update py-meson to 0.49.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/acff3ef7a1b1
branches: trunk
changeset: 392690:acff3ef7a1b1
user: prlw1 <prlw1%pkgsrc.org@localhost>
date: Tue Mar 05 16:30:18 2019 +0000
description:
Update py-meson to 0.49.2
No release notes provided.
In brief:
- meson still strips rpath on install
- glib2 requires meson >= 0.48.0
diffstat:
devel/py-meson/Makefile | 4 +-
devel/py-meson/PLIST | 30 ++-
devel/py-meson/distinfo | 18 +-
devel/py-meson/patches/patch-mesonbuild_compilers_____init____.py | 22 --
devel/py-meson/patches/patch-mesonbuild_compilers_c.py | 15 -
devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py | 97 +++++----
devel/py-meson/patches/patch-mesonbuild_environment.py | 36 +--
devel/py-meson/patches/patch-mesonbuild_minstall.py | 10 +-
8 files changed, 108 insertions(+), 124 deletions(-)
diffs (truncated from 358 to 300 lines):
diff -r b6b50aa5fad5 -r acff3ef7a1b1 devel/py-meson/Makefile
--- a/devel/py-meson/Makefile Tue Mar 05 16:27:53 2019 +0000
+++ b/devel/py-meson/Makefile Tue Mar 05 16:30:18 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2018/09/04 14:46:52 prlw1 Exp $
+# $NetBSD: Makefile,v 1.15 2019/03/05 16:30:18 prlw1 Exp $
-DISTNAME= meson-0.47.2
+DISTNAME= meson-0.49.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/}
diff -r b6b50aa5fad5 -r acff3ef7a1b1 devel/py-meson/PLIST
--- a/devel/py-meson/PLIST Tue Mar 05 16:27:53 2019 +0000
+++ b/devel/py-meson/PLIST Tue Mar 05 16:30:18 2019 +0000
@@ -1,12 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2018/09/02 15:20:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/03/05 16:30:18 prlw1 Exp $
bin/meson
-bin/mesonconf
-bin/mesonintrospect
-bin/mesontest
-bin/wraptool
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
${PYSITELIB}/${EGG_INFODIR}/top_level.txt
${PYSITELIB}/mesonbuild/__init__.py
${PYSITELIB}/mesonbuild/__init__.pyc
@@ -44,6 +41,9 @@
${PYSITELIB}/mesonbuild/compilers/c.py
${PYSITELIB}/mesonbuild/compilers/c.pyc
${PYSITELIB}/mesonbuild/compilers/c.pyo
+${PYSITELIB}/mesonbuild/compilers/c_function_attributes.py
+${PYSITELIB}/mesonbuild/compilers/c_function_attributes.pyc
+${PYSITELIB}/mesonbuild/compilers/c_function_attributes.pyo
${PYSITELIB}/mesonbuild/compilers/compilers.py
${PYSITELIB}/mesonbuild/compilers/compilers.pyc
${PYSITELIB}/mesonbuild/compilers/compilers.pyo
@@ -89,6 +89,7 @@
${PYSITELIB}/mesonbuild/dependencies/boost.py
${PYSITELIB}/mesonbuild/dependencies/boost.pyc
${PYSITELIB}/mesonbuild/dependencies/boost.pyo
+${PYSITELIB}/mesonbuild/dependencies/data/CMakeLists.txt
${PYSITELIB}/mesonbuild/dependencies/dev.py
${PYSITELIB}/mesonbuild/dependencies/dev.pyc
${PYSITELIB}/mesonbuild/dependencies/dev.pyo
@@ -137,9 +138,15 @@
${PYSITELIB}/mesonbuild/modules/__init__.py
${PYSITELIB}/mesonbuild/modules/__init__.pyc
${PYSITELIB}/mesonbuild/modules/__init__.pyo
+${PYSITELIB}/mesonbuild/modules/dlang.py
+${PYSITELIB}/mesonbuild/modules/dlang.pyc
+${PYSITELIB}/mesonbuild/modules/dlang.pyo
${PYSITELIB}/mesonbuild/modules/gnome.py
${PYSITELIB}/mesonbuild/modules/gnome.pyc
${PYSITELIB}/mesonbuild/modules/gnome.pyo
+${PYSITELIB}/mesonbuild/modules/hotdoc.py
+${PYSITELIB}/mesonbuild/modules/hotdoc.pyc
+${PYSITELIB}/mesonbuild/modules/hotdoc.pyo
${PYSITELIB}/mesonbuild/modules/i18n.py
${PYSITELIB}/mesonbuild/modules/i18n.pyc
${PYSITELIB}/mesonbuild/modules/i18n.pyo
@@ -179,6 +186,12 @@
${PYSITELIB}/mesonbuild/mparser.py
${PYSITELIB}/mesonbuild/mparser.pyc
${PYSITELIB}/mesonbuild/mparser.pyo
+${PYSITELIB}/mesonbuild/msetup.py
+${PYSITELIB}/mesonbuild/msetup.pyc
+${PYSITELIB}/mesonbuild/msetup.pyo
+${PYSITELIB}/mesonbuild/msubprojects.py
+${PYSITELIB}/mesonbuild/msubprojects.pyc
+${PYSITELIB}/mesonbuild/msubprojects.pyo
${PYSITELIB}/mesonbuild/mtest.py
${PYSITELIB}/mesonbuild/mtest.pyc
${PYSITELIB}/mesonbuild/mtest.pyo
@@ -218,6 +231,9 @@
${PYSITELIB}/mesonbuild/scripts/gtkdochelper.py
${PYSITELIB}/mesonbuild/scripts/gtkdochelper.pyc
${PYSITELIB}/mesonbuild/scripts/gtkdochelper.pyo
+${PYSITELIB}/mesonbuild/scripts/hotdochelper.py
+${PYSITELIB}/mesonbuild/scripts/hotdochelper.pyc
+${PYSITELIB}/mesonbuild/scripts/hotdochelper.pyo
${PYSITELIB}/mesonbuild/scripts/meson_exe.py
${PYSITELIB}/mesonbuild/scripts/meson_exe.pyc
${PYSITELIB}/mesonbuild/scripts/meson_exe.pyo
@@ -252,8 +268,4 @@
${PYSITELIB}/mesonbuild/wrap/wraptool.pyc
${PYSITELIB}/mesonbuild/wrap/wraptool.pyo
man/man1/meson.1
-man/man1/mesonconf.1
-man/man1/mesonintrospect.1
-man/man1/mesontest.1
-man/man1/wraptool.1
share/polkit-1/actions/com.mesonbuild.install.policy
diff -r b6b50aa5fad5 -r acff3ef7a1b1 devel/py-meson/distinfo
--- a/devel/py-meson/distinfo Tue Mar 05 16:27:53 2019 +0000
+++ b/devel/py-meson/distinfo Tue Mar 05 16:30:18 2019 +0000
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.13 2018/09/05 14:39:13 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2019/03/05 16:30:18 prlw1 Exp $
-SHA1 (meson-0.47.2.tar.gz) = 58278fa1e65d4e9197b8e3ca8c3ca2bc4d8283d2
-RMD160 (meson-0.47.2.tar.gz) = 6941232c36102c9d5b7ebd4b42e38aca7d3a67d2
-SHA512 (meson-0.47.2.tar.gz) = 9d7cea6151b99dff0c34d72b63473aecf7565636ba2b48d9fe86ce25372d1c71a834654f4745ae29e0fcacffcad806a1f6d937bcf5fe88cd9b16b72bf2d62112
-Size (meson-0.47.2.tar.gz) = 1267957 bytes
-SHA1 (patch-mesonbuild_compilers_____init____.py) = b893759a6fa135f2da606ea487848701dbba037d
-SHA1 (patch-mesonbuild_compilers_c.py) = 2ff2b4b715b3fa233ae158fcf9ccff75c1dcd42b
-SHA1 (patch-mesonbuild_compilers_compilers.py) = ab44b1672b2d1cc6258b74590ac6bbf0fe502066
-SHA1 (patch-mesonbuild_environment.py) = 08957ccc7ee55f9d5b7f965309bbe5ad38aa23ce
-SHA1 (patch-mesonbuild_minstall.py) = e312e881db36dcee9fca6eadc10a7c6eab475f2b
+SHA1 (meson-0.49.2.tar.gz) = 9c16f7a72ea15669efdcbc7ac01cf3e00ffb55c8
+RMD160 (meson-0.49.2.tar.gz) = 6ce4677fedba1bff8e4174a16c4361d1364b0abd
+SHA512 (meson-0.49.2.tar.gz) = 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
+Size (meson-0.49.2.tar.gz) = 1340730 bytes
+SHA1 (patch-mesonbuild_compilers_compilers.py) = 7141c7ca2acb093ff94e11e3ee452df379564fb5
+SHA1 (patch-mesonbuild_environment.py) = f599ec7c708037002da5d9ee4ca0ccfb31b2e307
+SHA1 (patch-mesonbuild_minstall.py) = 64bcbdac0d37cabd114349de34646820893bb212
diff -r b6b50aa5fad5 -r acff3ef7a1b1 devel/py-meson/patches/patch-mesonbuild_compilers_____init____.py
--- a/devel/py-meson/patches/patch-mesonbuild_compilers_____init____.py Tue Mar 05 16:27:53 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-mesonbuild_compilers_____init____.py,v 1.1 2018/05/15 09:04:37 jperkin Exp $
-
-Support SunOS-specific GCC behaviour.
-
---- mesonbuild/compilers/__init__.py.orig 2017-07-21 20:07:34.000000000 +0000
-+++ mesonbuild/compilers/__init__.py
-@@ -20,6 +20,7 @@ __all__ = [
- 'GCC_CYGWIN',
- 'GCC_MINGW',
- 'GCC_OSX',
-+ 'GCC_SUNOS',
- 'GCC_STANDARD',
- 'ICC_OSX',
- 'ICC_STANDARD',
-@@ -84,6 +85,7 @@ __all__ = [
- # Bring symbols from each module into compilers sub-package namespace
- from .compilers import (
- GCC_OSX,
-+ GCC_SUNOS,
- GCC_MINGW,
- GCC_CYGWIN,
- GCC_STANDARD,
diff -r b6b50aa5fad5 -r acff3ef7a1b1 devel/py-meson/patches/patch-mesonbuild_compilers_c.py
--- a/devel/py-meson/patches/patch-mesonbuild_compilers_c.py Tue Mar 05 16:27:53 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-mesonbuild_compilers_c.py,v 1.1 2018/09/05 14:39:13 jperkin Exp $
-
-Support SunOS.
-
---- mesonbuild/compilers/c.py.orig 2018-08-25 08:05:50.000000000 +0000
-+++ mesonbuild/compilers/c.py
-@@ -162,7 +162,7 @@ class CCompiler(Compiler):
- if self.gcc_type == compilers.GCC_OSX:
- # Apple ld
- return ['-Wl,-undefined,dynamic_lookup']
-- else:
-+ elif self.gcc_type != compilers.GCC_SUNOS:
- # GNU ld and LLVM lld
- return ['-Wl,--allow-shlib-undefined']
- elif self.id == 'msvc':
diff -r b6b50aa5fad5 -r acff3ef7a1b1 devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py
--- a/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py Tue Mar 05 16:27:53 2019 +0000
+++ b/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py Tue Mar 05 16:30:18 2019 +0000
@@ -1,57 +1,76 @@
-$NetBSD: patch-mesonbuild_compilers_compilers.py,v 1.2 2018/09/02 15:20:02 wiz Exp $
+$NetBSD: patch-mesonbuild_compilers_compilers.py,v 1.3 2019/03/05 16:30:18 prlw1 Exp $
Support SunOS-specific GCC behaviour.
Limit GNU ld options correctly.
---- mesonbuild/compilers/compilers.py.orig 2018-06-22 11:50:56.000000000 +0000
+--- mesonbuild/compilers/compilers.py.orig 2019-01-23 16:46:09.000000000 +0000
+++ mesonbuild/compilers/compilers.py
-@@ -172,6 +172,14 @@ arm_buildtype_linker_args = {'plain': []
- 'minsize': [],
- }
+@@ -174,6 +174,14 @@ apple_buildtype_linker_args = {'plain':
+ 'custom': [],
+ }
-+sunos_buildtype_linker_args = {'plain': [],
-+ 'debug': [],
-+ 'debugoptimized': [],
-+ 'release': [],
-+ 'minsize': [],
-+ }
-+
++sunos_buildtype_args = {'plain': [],
++ 'debug': [],
++ 'debugoptimized': [],
++ 'release': [],
++ 'minsize': [],
++ 'custom': [],
++ }
+
- msvc_buildtype_linker_args = {'plain': [],
- 'debug': [],
- 'debugoptimized': [],
-@@ -1034,7 +1042,7 @@ class Compiler:
- # linked against local libraries will fail to resolve them.
- args.append('-Wl,-z,origin')
- args.append('-Wl,-rpath,' + paths)
+ gnulike_buildtype_linker_args = {'plain': [],
+ 'debug': [],
+ 'debugoptimized': [],
+@@ -1210,7 +1218,7 @@ class Compiler:
+ paths = paths + ':' + padding
+ args.append('-Wl,-rpath,' + paths)
+
- if get_compiler_is_linuxlike(self):
+ if get_compiler_uses_gnuld(self):
# Rpaths to use while linking must be absolute. These are not
# written to the binary. Needed only with GNU ld:
# https://sourceware.org/bugzilla/show_bug.cgi?id=16936
-@@ -1066,6 +1074,7 @@ GCC_STANDARD = 0
- GCC_OSX = 1
- GCC_MINGW = 2
- GCC_CYGWIN = 3
-+GCC_SUNOS = 4
+@@ -1295,6 +1303,7 @@ class CompilerType(enum.Enum):
+ GCC_OSX = 1
+ GCC_MINGW = 2
+ GCC_CYGWIN = 3
++ GCC_SUNOS = 4
+
+ CLANG_STANDARD = 10
+ CLANG_OSX = 11
+@@ -1318,6 +1327,10 @@ class CompilerType(enum.Enum):
+ return self.name in ('GCC_OSX', 'CLANG_OSX', 'ICC_OSX')
- CLANG_STANDARD = 0
- CLANG_OSX = 1
-@@ -1095,7 +1104,7 @@ def get_gcc_soname_args(gcc_type, prefix
- sostr = ''
- else:
- sostr = '.' + soversion
-- if gcc_type == GCC_STANDARD:
-+ if gcc_type in (GCC_STANDARD, GCC_SUNOS):
- return ['-Wl,-soname,%s%s.%s%s' % (prefix, shlib_name, suffix, sostr)]
- elif gcc_type in (GCC_MINGW, GCC_CYGWIN):
- # For PE/COFF the soname argument has no effect with GNU LD
-@@ -1236,6 +1245,8 @@ class GnuCompiler:
+ @property
++ def is_sunos_compiler(self):
++ return self.name in ('GCC_SUNOS')
++
++ @property
+ def is_windows_compiler(self):
+ return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN', 'ARM_WIN', 'CCRX_WIN')
+
+@@ -1359,6 +1372,7 @@ def get_compiler_uses_gnuld(c):
+ CompilerType.GCC_STANDARD,
+ CompilerType.GCC_MINGW,
+ CompilerType.GCC_CYGWIN,
++ CompilerType.GCC_SUNOS,
+ CompilerType.CLANG_STANDARD,
+ CompilerType.CLANG_MINGW,
+ CompilerType.ICC_STANDARD,
+@@ -1474,6 +1488,8 @@ class GnuLikeCompiler(abc.ABC):
def get_buildtype_linker_args(self, buildtype):
- if self.gcc_type == GCC_OSX:
+ if self.compiler_type.is_osx_compiler:
return apple_buildtype_linker_args[buildtype]
-+ elif self.gcc_type == GCC_SUNOS:
++ elif self.compiler_type.is_sunos_compiler:
+ return sunos_buildtype_linker_args[buildtype]
return gnulike_buildtype_linker_args[buildtype]
- def get_pch_suffix(self):
+ @abc.abstractmethod
+@@ -1538,6 +1554,8 @@ class GnuLikeCompiler(abc.ABC):
+ if self.compiler_type.is_osx_compiler:
+ # Apple ld
+ return ['-Wl,-undefined,dynamic_lookup']
++ elif self.compiler_type.is_sunos_compiler:
++ return []
+ elif self.compiler_type.is_windows_compiler:
+ # For PE/COFF this is impossible
+ return []
diff -r b6b50aa5fad5 -r acff3ef7a1b1 devel/py-meson/patches/patch-mesonbuild_environment.py
--- a/devel/py-meson/patches/patch-mesonbuild_environment.py Tue Mar 05 16:27:53 2019 +0000
+++ b/devel/py-meson/patches/patch-mesonbuild_environment.py Tue Mar 05 16:30:18 2019 +0000
@@ -1,32 +1,24 @@
-$NetBSD: patch-mesonbuild_environment.py,v 1.2 2018/05/15 09:04:37 jperkin Exp $
+$NetBSD: patch-mesonbuild_environment.py,v 1.3 2019/03/05 16:30:18 prlw1 Exp $
Support SunOS ar and SunOS-specific GCC behaviour.
---- mesonbuild/environment.py.orig 2018-02-20 21:48:57.000000000 +0000
+--- mesonbuild/environment.py.orig 2019-01-23 16:46:09.000000000 +0000
+++ mesonbuild/environment.py
-@@ -29,6 +29,7 @@ from .compilers import (
- GCC_CYGWIN,
- GCC_MINGW,
- GCC_OSX,
-+ GCC_SUNOS,
Home |
Main Index |
Thread Index |
Old Index