CVS commit: pkgsrc/devel/meson

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Aug 15 08:19:39 UTC 2022

Modified Files:
        pkgsrc/devel/meson: Makefile distinfo
        pkgsrc/devel/meson/patches: patch-mesonbuild_compilers_detect.py

Log Message:
meson: updated to 0.63.1

0.63.1
Bug fixes


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/devel/meson/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.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/meson/Makefile
diff -u pkgsrc/devel/meson/Makefile:1.42 pkgsrc/devel/meson/Makefile:1.43
--- pkgsrc/devel/meson/Makefile:1.42    Wed Jul 13 03:57:22 2022
+++ pkgsrc/devel/meson/Makefile Mon Aug 15 08:19:39 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2022/07/13 03:57:22 triaxx Exp $
+# $NetBSD: Makefile,v 1.43 2022/08/15 08:19:39 adam Exp $
 
-DISTNAME=      meson-0.63.0
+DISTNAME=      meson-0.63.1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.38 pkgsrc/devel/meson/distinfo:1.39
--- pkgsrc/devel/meson/distinfo:1.38    Wed Jul 13 03:57:22 2022
+++ pkgsrc/devel/meson/distinfo Mon Aug 15 08:19:39 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.38 2022/07/13 03:57:22 triaxx Exp $
+$NetBSD: distinfo,v 1.39 2022/08/15 08:19:39 adam Exp $
 
-BLAKE2s (meson-0.63.0.tar.gz) = 8d4c14d32dfdda1f75157050919413bcb8b6d38f05525f08de44a08977665a7e
-SHA512 (meson-0.63.0.tar.gz) = 8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea
-Size (meson-0.63.0.tar.gz) = 2060688 bytes
-SHA1 (patch-mesonbuild_compilers_detect.py) = e94972df4035a556f40e236d2400ef31784a53f0
+BLAKE2s (meson-0.63.1.tar.gz) = e7b13f3b36836a6bccb760684084764e5847dd0487a337f4102ce6a0a6a92af8
+SHA512 (meson-0.63.1.tar.gz) = 25f96e18bcdbb6346c44d9f8e63035d6cb3d8f781cf43ac5530ddd6f8090f4d16d192f8d331240154602e92b498b410fabb1381dc5f39db1dfb9da05a964d44e
+Size (meson-0.63.1.tar.gz) = 2064118 bytes
+SHA1 (patch-mesonbuild_compilers_detect.py) = 44b3a70a127824808c8a05226a546988c6a1339f
 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 34c2f6f215d5aed1d6c422187f733d0d488ebb4f
 SHA1 (patch-mesonbuild_dependencies_dev.py) = 2165f1ee4ad5d9689eb2fb7e94841503336070b9
 SHA1 (patch-mesonbuild_linkers_linkers.py) = 4ca793f71aac2119f94464bb2beb83ed3da3e9a0

Index: pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py
diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.2 pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.3
--- pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.2 Wed Jul 13 03:57:22 2022
+++ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py     Mon Aug 15 08:19:39 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-mesonbuild_compilers_detect.py,v 1.2 2022/07/13 03:57:22 triaxx Exp $
+$NetBSD: patch-mesonbuild_compilers_detect.py,v 1.3 2022/08/15 08:19:39 adam Exp $
 
 Specify c++ language when making CXX parse standard input.
 Fixes problem where graphics/MesaLib fails to build due to:
@@ -6,9 +6,9 @@ Fixes problem where graphics/MesaLib fai
 > clang++ -std=c++14 -dM -E -
 > error: invalid argument '-std=c++14' not allowed with 'C'
 
---- mesonbuild/compilers/detect.py.orig        2021-09-10 05:30:31.000000000 +0000
+--- mesonbuild/compilers/detect.py.orig        2022-08-13 08:48:46.000000000 +0000
 +++ mesonbuild/compilers/detect.py
-@@ -1224,7 +1224,10 @@ def _get_gnu_compiler_defines(compiler: 
+@@ -1231,7 +1231,10 @@ def _get_gnu_compiler_defines(compiler: 
      """
      # Arguments to output compiler pre-processor defines to stdout
      # gcc, g++, and gfortran all support these arguments
@@ -17,10 +17,10 @@ Fixes problem where graphics/MesaLib fai
 +    if compiler[0].endswith('++'):
 +        args += ['-x', 'c++']
 +    args += ['-']
+     mlog.debug(f'Running command: {join_args(args)}')
      p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
      if p.returncode != 0:
-         raise EnvironmentException('Unable to detect GNU compiler type:\n' + output + error)
-@@ -1248,7 +1251,10 @@ def _get_clang_compiler_defines(compiler
+@@ -1258,7 +1261,10 @@ def _get_clang_compiler_defines(compiler
      """
      Get the list of Clang pre-processor defines
      """
@@ -29,6 +29,6 @@ Fixes problem where graphics/MesaLib fai
 +    if compiler[0].endswith('++'):
 +        args += ['-x', 'c++']
 +    args += ['-']
+     mlog.debug(f'Running command: {join_args(args)}')
      p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
      if p.returncode != 0:
-         raise EnvironmentException('Unable to get clang pre-processor defines:\n' + output + error)