pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/py-meson



Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Jul  6 22:42:25 UTC 2019

Modified Files:
        pkgsrc/devel/py-meson: Makefile PLIST distinfo
        pkgsrc/devel/py-meson/patches: patch-mesonbuild_compilers_compilers.py
            patch-mesonbuild_environment.py

Log Message:
py-meson: updated to 0.51.0

0.51.0:
(C) Preprocessor flag handling
Sanity checking compilers with user flags
New sourceset module
n_debug=if-release and buildtype=plain means no asserts
target_type in build_targets accepts the value 'shared_module'
New modules kwarg for python.find_installation
Support for the Intel Compiler on Windows (ICL)
Added basic support for the Xtensa CPU toolchain
Dependency objects now have a get_variable method
CMake prefix path overrides
Tests that should fail but did not are now errors
New target keyword argument: link_language
New module to parse kconfig output files
Add new meson subprojects foreach command
Added c17 and c18 as c_std values for recent GCC and Clang Versions
gpgme dependency now supports gpgme-config
Can link against custom targets
Removed the deprecated --target-files API
Generators have a new depends keyword argument
Specifying options per mer machine
subproject.get_variable() now accepts a fallback argument
Add keyword static to find_library
Fortran include statements recursively parsed
CMake subprojects
Multipe cross files can be specified


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-meson/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-meson/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-meson/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-meson/Makefile
diff -u pkgsrc/devel/py-meson/Makefile:1.23 pkgsrc/devel/py-meson/Makefile:1.24
--- pkgsrc/devel/py-meson/Makefile:1.23 Wed Jun 26 18:35:25 2019
+++ pkgsrc/devel/py-meson/Makefile      Sat Jul  6 22:42:25 2019
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2019/06/26 18:35:25 schmonz Exp $
+# $NetBSD: Makefile,v 1.24 2019/07/06 22:42:25 adam Exp $
 
-DISTNAME=      meson-0.50.1
+DISTNAME=      meson-0.51.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/py-meson/PLIST
diff -u pkgsrc/devel/py-meson/PLIST:1.7 pkgsrc/devel/py-meson/PLIST:1.8
--- pkgsrc/devel/py-meson/PLIST:1.7     Wed May 22 09:52:52 2019
+++ pkgsrc/devel/py-meson/PLIST Sat Jul  6 22:42:25 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2019/05/22 09:52:52 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/07/06 22:42:25 adam Exp $
 bin/meson
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -53,6 +53,18 @@ ${PYSITELIB}/mesonbuild/backend/xcodebac
 ${PYSITELIB}/mesonbuild/build.py
 ${PYSITELIB}/mesonbuild/build.pyc
 ${PYSITELIB}/mesonbuild/build.pyo
+${PYSITELIB}/mesonbuild/cmake/__init__.py
+${PYSITELIB}/mesonbuild/cmake/__init__.pyc
+${PYSITELIB}/mesonbuild/cmake/__init__.pyo
+${PYSITELIB}/mesonbuild/cmake/client.py
+${PYSITELIB}/mesonbuild/cmake/client.pyc
+${PYSITELIB}/mesonbuild/cmake/client.pyo
+${PYSITELIB}/mesonbuild/cmake/common.py
+${PYSITELIB}/mesonbuild/cmake/common.pyc
+${PYSITELIB}/mesonbuild/cmake/common.pyo
+${PYSITELIB}/mesonbuild/cmake/interpreter.py
+${PYSITELIB}/mesonbuild/cmake/interpreter.pyc
+${PYSITELIB}/mesonbuild/cmake/interpreter.pyo
 ${PYSITELIB}/mesonbuild/compilers/__init__.py
 ${PYSITELIB}/mesonbuild/compilers/__init__.pyc
 ${PYSITELIB}/mesonbuild/compilers/__init__.pyo
@@ -62,6 +74,9 @@ ${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/clike.py
+${PYSITELIB}/mesonbuild/compilers/clike.pyc
+${PYSITELIB}/mesonbuild/compilers/clike.pyo
 ${PYSITELIB}/mesonbuild/compilers/compilers.py
 ${PYSITELIB}/mesonbuild/compilers/compilers.pyc
 ${PYSITELIB}/mesonbuild/compilers/compilers.pyo
@@ -111,6 +126,7 @@ ${PYSITELIB}/mesonbuild/dependencies/boo
 ${PYSITELIB}/mesonbuild/dependencies/boost.pyc
 ${PYSITELIB}/mesonbuild/dependencies/boost.pyo
 ${PYSITELIB}/mesonbuild/dependencies/data/CMakeLists.txt
+${PYSITELIB}/mesonbuild/dependencies/data/CMakeListsLLVM.txt
 ${PYSITELIB}/mesonbuild/dependencies/data/CMakePathInfo.txt
 ${PYSITELIB}/mesonbuild/dependencies/dev.py
 ${PYSITELIB}/mesonbuild/dependencies/dev.pyc
@@ -202,12 +218,18 @@ ${PYSITELIB}/mesonbuild/modules/qt5.pyo
 ${PYSITELIB}/mesonbuild/modules/rpm.py
 ${PYSITELIB}/mesonbuild/modules/rpm.pyc
 ${PYSITELIB}/mesonbuild/modules/rpm.pyo
+${PYSITELIB}/mesonbuild/modules/sourceset.py
+${PYSITELIB}/mesonbuild/modules/sourceset.pyc
+${PYSITELIB}/mesonbuild/modules/sourceset.pyo
 ${PYSITELIB}/mesonbuild/modules/unstable_cuda.py
 ${PYSITELIB}/mesonbuild/modules/unstable_cuda.pyc
 ${PYSITELIB}/mesonbuild/modules/unstable_cuda.pyo
 ${PYSITELIB}/mesonbuild/modules/unstable_icestorm.py
 ${PYSITELIB}/mesonbuild/modules/unstable_icestorm.pyc
 ${PYSITELIB}/mesonbuild/modules/unstable_icestorm.pyo
+${PYSITELIB}/mesonbuild/modules/unstable_kconfig.py
+${PYSITELIB}/mesonbuild/modules/unstable_kconfig.pyc
+${PYSITELIB}/mesonbuild/modules/unstable_kconfig.pyo
 ${PYSITELIB}/mesonbuild/modules/unstable_simd.py
 ${PYSITELIB}/mesonbuild/modules/unstable_simd.pyc
 ${PYSITELIB}/mesonbuild/modules/unstable_simd.pyo

Index: pkgsrc/devel/py-meson/distinfo
diff -u pkgsrc/devel/py-meson/distinfo:1.20 pkgsrc/devel/py-meson/distinfo:1.21
--- pkgsrc/devel/py-meson/distinfo:1.20 Thu Jun  6 05:40:50 2019
+++ pkgsrc/devel/py-meson/distinfo      Sat Jul  6 22:42:25 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.20 2019/06/06 05:40:50 adam Exp $
+$NetBSD: distinfo,v 1.21 2019/07/06 22:42:25 adam Exp $
 
-SHA1 (meson-0.50.1.tar.gz) = 252175efb8fdaff0e815cfbef1be14f8fbd5b66c
-RMD160 (meson-0.50.1.tar.gz) = 483329d8c8d1087951a7839cd04a9c230ad86fa4
-SHA512 (meson-0.50.1.tar.gz) = 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd
-Size (meson-0.50.1.tar.gz) = 1402160 bytes
-SHA1 (patch-mesonbuild_compilers_compilers.py) = 6b1be661a9fe97e55cf394ff06a33fe72c85f434
-SHA1 (patch-mesonbuild_environment.py) = f599ec7c708037002da5d9ee4ca0ccfb31b2e307
+SHA1 (meson-0.51.0.tar.gz) = 68aa80478c3e61a1a74a5776c6aa657338c189fa
+RMD160 (meson-0.51.0.tar.gz) = 8a8acd0f7d7aa17b71ed44310b07e33bdcd7f60b
+SHA512 (meson-0.51.0.tar.gz) = e434dbb16bea658cd920617021f1f166ceffcabdcee512e893bf7c002d0955935b07e3b39707de77f1524e65b7f96ef5cd2b2a63d74cd8f4f2d610bc593b0d0f
+Size (meson-0.51.0.tar.gz) = 1449793 bytes
+SHA1 (patch-mesonbuild_compilers_compilers.py) = 08404a441ec8ba37c780af4fba44492021f858dd
+SHA1 (patch-mesonbuild_environment.py) = 7df96002a8b625cfa08b88cfa4f0cf4d5b76cf64
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b

Index: pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py
diff -u pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py:1.6 pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py:1.7
--- pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py:1.6   Mon Mar 11 12:08:19 2019
+++ pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py       Sat Jul  6 22:42:25 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-mesonbuild_compilers_compilers.py,v 1.6 2019/03/11 12:08:19 jperkin Exp $
+$NetBSD: patch-mesonbuild_compilers_compilers.py,v 1.7 2019/07/06 22:42:25 adam Exp $
 
 Support SunOS-specific GCC behaviour.
 Limit GNU ld options correctly.
 
---- mesonbuild/compilers/compilers.py.orig     2019-01-23 16:46:09.000000000 +0000
+--- mesonbuild/compilers/compilers.py.orig     2019-06-16 18:54:18.000000000 +0000
 +++ mesonbuild/compilers/compilers.py
-@@ -174,6 +174,14 @@ apple_buildtype_linker_args = {'plain': 
+@@ -198,6 +198,14 @@ apple_buildtype_linker_args = {'plain': 
                                 'custom': [],
                                 }
  
@@ -20,16 +20,16 @@ Limit GNU ld options correctly.
  gnulike_buildtype_linker_args = {'plain': [],
                                   'debug': [],
                                   'debugoptimized': [],
-@@ -1210,7 +1218,7 @@ class Compiler:
-                     paths = paths + ':' + padding
-             args.append('-Wl,-rpath,' + paths)
+@@ -1304,7 +1312,7 @@ class Compiler:
+         if mesonlib.is_sunos():
+             return args
  
 -        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
-@@ -1295,6 +1303,7 @@ class CompilerType(enum.Enum):
+@@ -1395,6 +1403,7 @@ class CompilerType(enum.Enum):
      GCC_OSX = 1
      GCC_MINGW = 2
      GCC_CYGWIN = 3
@@ -37,8 +37,8 @@ Limit GNU ld options correctly.
  
      CLANG_STANDARD = 10
      CLANG_OSX = 11
-@@ -1318,6 +1327,10 @@ class CompilerType(enum.Enum):
-         return self.name in ('GCC_OSX', 'CLANG_OSX', 'ICC_OSX')
+@@ -1422,6 +1431,10 @@ class CompilerType(enum.Enum):
+         return self.name in ('GCC_OSX', 'CLANG_OSX', 'ICC_OSX', 'PGI_OSX')
  
      @property
 +    def is_sunos_compiler(self):
@@ -46,9 +46,9 @@ Limit GNU ld options correctly.
 +
 +    @property
      def is_windows_compiler(self):
-         return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN', 'ARM_WIN', 'CCRX_WIN')
+         return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN', 'ARM_WIN', 'CCRX_WIN', 'PGI_WIN')
  
-@@ -1330,7 +1343,7 @@ def get_macos_dylib_install_name(prefix,
+@@ -1434,7 +1447,7 @@ def get_macos_dylib_install_name(prefix,
      return '@rpath/' + install_name
  
  def get_gcc_soname_args(compiler_type, prefix, shlib_name, suffix, soversion, darwin_versions, is_shared_module):
@@ -57,7 +57,7 @@ Limit GNU ld options correctly.
          sostr = '' if soversion is None else '.' + soversion
          return ['-Wl,-soname,%s%s.%s%s' % (prefix, shlib_name, suffix, sostr)]
      elif compiler_type.is_windows_compiler:
-@@ -1474,6 +1487,8 @@ class GnuLikeCompiler(abc.ABC):
+@@ -1912,6 +1925,8 @@ class GnuLikeCompiler(abc.ABC):
      def get_buildtype_linker_args(self, buildtype):
          if self.compiler_type.is_osx_compiler:
              return apple_buildtype_linker_args[buildtype]
@@ -66,7 +66,7 @@ Limit GNU ld options correctly.
          return gnulike_buildtype_linker_args[buildtype]
  
      @abc.abstractmethod
-@@ -1538,6 +1553,8 @@ class GnuLikeCompiler(abc.ABC):
+@@ -1976,6 +1991,8 @@ class GnuLikeCompiler(abc.ABC):
          if self.compiler_type.is_osx_compiler:
              # Apple ld
              return ['-Wl,-undefined,dynamic_lookup']

Index: pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py
diff -u pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py:1.3 pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py:1.4
--- pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py:1.3   Tue Mar  5 16:30:18 2019
+++ pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py       Sat Jul  6 22:42:25 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-mesonbuild_environment.py,v 1.3 2019/03/05 16:30:18 prlw1 Exp $
+$NetBSD: patch-mesonbuild_environment.py,v 1.4 2019/07/06 22:42:25 adam Exp $
 
 Support SunOS ar and SunOS-specific GCC behaviour.
 
---- mesonbuild/environment.py.orig     2019-01-23 16:46:09.000000000 +0000
+--- mesonbuild/environment.py.orig     2019-06-16 18:54:18.000000000 +0000
 +++ mesonbuild/environment.py
-@@ -528,6 +528,8 @@ class Environment:
+@@ -613,6 +613,8 @@ class Environment:
              return CompilerType.GCC_MINGW
          elif '__CYGWIN__' in defines:
              return CompilerType.GCC_CYGWIN
@@ -12,8 +12,8 @@ Support SunOS ar and SunOS-specific GCC 
 +            return CompilerType.GCC_SUNOS
          return CompilerType.GCC_STANDARD
  
-     def _get_compilers(self, lang, want_cross):
-@@ -1019,6 +1021,8 @@ class Environment:
+     def _get_compilers(self, lang, for_machine):
+@@ -1220,6 +1222,8 @@ class Environment:
                  return ArLinker(linker)
              if p.returncode == 1 and err.startswith('usage'): # OSX
                  return ArLinker(linker)
@@ -21,4 +21,4 @@ Support SunOS ar and SunOS-specific GCC 
 +                return ArLinker(linker)
              if p.returncode == 1 and err.startswith('Usage'): # AIX
                  return ArLinker(linker)
-         self._handle_exceptions(popen_exceptions, linkers, 'linker')
+             if p.returncode == 1 and err.startswith('ar: bad option: --'): # Solaris



Home | Main Index | Thread Index | Old Index