Tue Jul 28 23:28:23 2020 UTC ()
only match '++' at the end of the string in previous


(tnn)
diff -r1.12 -r1.13 pkgsrc/devel/meson/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/meson/patches/patch-mesonbuild_environment.py
cvs diff -r1.12 -r1.13 pkgsrc/devel/meson/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/meson/distinfo 2020/07/28 22:43:01 1.12
+++ pkgsrc/devel/meson/distinfo 2020/07/28 23:28:23 1.13
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.12 2020/07/28 22:43:01 tnn Exp $ 1$NetBSD: distinfo,v 1.13 2020/07/28 23:28:23 tnn Exp $
2 2
3SHA1 (meson-0.55.0.tar.gz) = 266c35ad4ea0b526e3437500b99a0745adf82d92 3SHA1 (meson-0.55.0.tar.gz) = 266c35ad4ea0b526e3437500b99a0745adf82d92
4RMD160 (meson-0.55.0.tar.gz) = 59db72dded4bf8dfb53dd5eb00d229e377a2ae80 4RMD160 (meson-0.55.0.tar.gz) = 59db72dded4bf8dfb53dd5eb00d229e377a2ae80
5SHA512 (meson-0.55.0.tar.gz) = bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2 5SHA512 (meson-0.55.0.tar.gz) = bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2
6Size (meson-0.55.0.tar.gz) = 1742882 bytes 6Size (meson-0.55.0.tar.gz) = 1742882 bytes
7SHA1 (patch-mesonbuild_dependencies_dev.py) = ce9b93369d771f7e24208923b58af769e51bcd98 7SHA1 (patch-mesonbuild_dependencies_dev.py) = ce9b93369d771f7e24208923b58af769e51bcd98
8SHA1 (patch-mesonbuild_environment.py) = 6bb8a8743a0706c8845a20bf297841af6c1de4b5 8SHA1 (patch-mesonbuild_environment.py) = d0340ea4149c7ed89fd64d0f1631721f7b9f04aa
9SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b5dff2fbc29199a2b1b18a0073e73461c517744 9SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b5dff2fbc29199a2b1b18a0073e73461c517744
10SHA1 (patch-mesonbuild_scripts_depfixer.py) = 4c212e4f25f5cf3fb993b41993580805d57695b3 10SHA1 (patch-mesonbuild_scripts_depfixer.py) = 4c212e4f25f5cf3fb993b41993580805d57695b3
cvs diff -r1.3 -r1.4 pkgsrc/devel/meson/patches/Attic/patch-mesonbuild_environment.py (expand / switch to unified diff)

--- pkgsrc/devel/meson/patches/Attic/patch-mesonbuild_environment.py 2020/07/28 22:43:01 1.3
+++ pkgsrc/devel/meson/patches/Attic/patch-mesonbuild_environment.py 2020/07/28 23:28:23 1.4
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1$NetBSD: patch-mesonbuild_environment.py,v 1.3 2020/07/28 22:43:01 tnn Exp $ 1$NetBSD: patch-mesonbuild_environment.py,v 1.4 2020/07/28 23:28:23 tnn Exp $
2 2
3Specify c++ language when making CXX parse standard input. 3Specify c++ language when making CXX parse standard input.
4Fixes problem where graphics/MesaLib fails to build due to: 4Fixes problem where graphics/MesaLib fails to build due to:
5 5
6> clang++ -std=c++14 -dM -E - 6> clang++ -std=c++14 -dM -E -
7> error: invalid argument '-std=c++14' not allowed with 'C' 7> error: invalid argument '-std=c++14' not allowed with 'C'
8 8
9--- mesonbuild/environment.py.orig 2020-07-05 20:13:14.000000000 +0000 9--- mesonbuild/environment.py.orig 2020-07-05 20:13:14.000000000 +0000
10+++ mesonbuild/environment.py 10+++ mesonbuild/environment.py
11@@ -708,7 +708,10 @@ class Environment: 11@@ -708,7 +708,10 @@ class Environment:
12 """ 12 """
13 # Arguments to output compiler pre-processor defines to stdout 13 # Arguments to output compiler pre-processor defines to stdout
14 # gcc, g++, and gfortran all support these arguments 14 # gcc, g++, and gfortran all support these arguments
15- args = compiler + ['-E', '-dM', '-'] 15- args = compiler + ['-E', '-dM', '-']
16+ args = compiler + ['-E', '-dM' ] 16+ args = compiler + ['-E', '-dM' ]
17+ if "++" in compiler[0]: 17+ if compiler[0].endswith('++'):
18+ args += [ '-x', 'c++' ] 18+ args += [ '-x', 'c++' ]
19+ args += [ '-' ] 19+ args += [ '-' ]
20 p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE) 20 p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
21 if p.returncode != 0: 21 if p.returncode != 0:
22 raise EnvironmentException('Unable to detect GNU compiler type:\n' + output + error) 22 raise EnvironmentException('Unable to detect GNU compiler type:\n' + output + error)
23@@ -750,7 +753,10 @@ class Environment: 23@@ -750,7 +753,10 @@ class Environment:
24 """ 24 """
25 Get the list of Clang pre-processor defines 25 Get the list of Clang pre-processor defines
26 """ 26 """
27- args = compiler + ['-E', '-dM', '-'] 27- args = compiler + ['-E', '-dM', '-']
28+ args = compiler + ['-E', '-dM' ] 28+ args = compiler + ['-E', '-dM' ]
29+ if "++" in compiler[0]: 29+ if compiler[0].endswith('++'):
30+ args += [ '-x', 'c++' ] 30+ args += [ '-x', 'c++' ]
31+ args += [ '-' ] 31+ args += [ '-' ]
32 p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE) 32 p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
33 if p.returncode != 0: 33 if p.returncode != 0:
34 raise EnvironmentException('Unable to get clang pre-processor defines:\n' + output + error) 34 raise EnvironmentException('Unable to get clang pre-processor defines:\n' + output + error)