Received: by mail.netbsd.org (Postfix, from userid 605) id 781E384D3F; Tue, 28 Jul 2020 22:43:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F21C484D28 for ; Tue, 28 Jul 2020 22:43:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id nL0VMalZpCUf for ; Tue, 28 Jul 2020 22:43:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5EF0884CCD for ; Tue, 28 Jul 2020 22:43:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 523D1FB28; Tue, 28 Jul 2020 22:43:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1595976181179610" MIME-Version: 1.0 Date: Tue, 28 Jul 2020 22:43:01 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/devel/meson To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20200728224301.523D1FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1595976181179610 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Tue Jul 28 22:43:01 UTC 2020 Modified Files: pkgsrc/devel/meson: Makefile distinfo Added Files: pkgsrc/devel/meson/patches: patch-mesonbuild_environment.py Log Message: meson: fix C++ compiler detection fallout from last update. Bump. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/meson/Makefile cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/meson/distinfo cvs rdiff -u -r0 -r1.3 \ pkgsrc/devel/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. --_----------=_1595976181179610 Content-Disposition: inline Content-Length: 3371 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/meson/Makefile diff -u pkgsrc/devel/meson/Makefile:1.14 pkgsrc/devel/meson/Makefile:1.15 --- pkgsrc/devel/meson/Makefile:1.14 Mon Jul 27 16:08:13 2020 +++ pkgsrc/devel/meson/Makefile Tue Jul 28 22:43:01 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2020/07/27 16:08:13 adam Exp $ +# $NetBSD: Makefile,v 1.15 2020/07/28 22:43:01 tnn Exp $ DISTNAME= meson-0.55.0 +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/} Index: pkgsrc/devel/meson/distinfo diff -u pkgsrc/devel/meson/distinfo:1.11 pkgsrc/devel/meson/distinfo:1.12 --- pkgsrc/devel/meson/distinfo:1.11 Mon Jul 27 16:08:13 2020 +++ pkgsrc/devel/meson/distinfo Tue Jul 28 22:43:01 2020 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.11 2020/07/27 16:08:13 adam Exp $ +$NetBSD: distinfo,v 1.12 2020/07/28 22:43:01 tnn Exp $ SHA1 (meson-0.55.0.tar.gz) = 266c35ad4ea0b526e3437500b99a0745adf82d92 RMD160 (meson-0.55.0.tar.gz) = 59db72dded4bf8dfb53dd5eb00d229e377a2ae80 SHA512 (meson-0.55.0.tar.gz) = bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2 Size (meson-0.55.0.tar.gz) = 1742882 bytes SHA1 (patch-mesonbuild_dependencies_dev.py) = ce9b93369d771f7e24208923b58af769e51bcd98 +SHA1 (patch-mesonbuild_environment.py) = 6bb8a8743a0706c8845a20bf297841af6c1de4b5 SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b5dff2fbc29199a2b1b18a0073e73461c517744 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 4c212e4f25f5cf3fb993b41993580805d57695b3 Added files: Index: pkgsrc/devel/meson/patches/patch-mesonbuild_environment.py diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_environment.py:1.3 --- /dev/null Tue Jul 28 22:43:01 2020 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_environment.py Tue Jul 28 22:43:01 2020 @@ -0,0 +1,34 @@ +$NetBSD: patch-mesonbuild_environment.py,v 1.3 2020/07/28 22:43:01 tnn Exp $ + +Specify c++ language when making CXX parse standard input. +Fixes problem where graphics/MesaLib fails to build due to: + +> clang++ -std=c++14 -dM -E - +> error: invalid argument '-std=c++14' not allowed with 'C' + +--- mesonbuild/environment.py.orig 2020-07-05 20:13:14.000000000 +0000 ++++ mesonbuild/environment.py +@@ -708,7 +708,10 @@ class Environment: + """ + # Arguments to output compiler pre-processor defines to stdout + # gcc, g++, and gfortran all support these arguments +- args = compiler + ['-E', '-dM', '-'] ++ args = compiler + ['-E', '-dM' ] ++ if "++" in compiler[0]: ++ args += [ '-x', 'c++' ] ++ 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) +@@ -750,7 +753,10 @@ class Environment: + """ + Get the list of Clang pre-processor defines + """ +- args = compiler + ['-E', '-dM', '-'] ++ args = compiler + ['-E', '-dM' ] ++ if "++" in compiler[0]: ++ args += [ '-x', 'c++' ] ++ 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) --_----------=_1595976181179610--