Received: by mail.netbsd.org (Postfix, from userid 605) id 6BC4A850D4; Tue, 15 May 2018 09:04:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EAAD484E53 for ; Tue, 15 May 2018 09:04:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 9HlYjmpZzNHT for ; Tue, 15 May 2018 09:04:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4134484DEF for ; Tue, 15 May 2018 09:04:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3BC05FBEC; Tue, 15 May 2018 09:04:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1526375077141130" MIME-Version: 1.0 Date: Tue, 15 May 2018 09:04:37 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/devel/py-meson To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180515090437.3BC05FBEC@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. --_----------=_1526375077141130 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue May 15 09:04:37 UTC 2018 Modified Files: pkgsrc/devel/py-meson: Makefile distinfo pkgsrc/devel/py-meson/patches: patch-mesonbuild_environment.py Added Files: pkgsrc/devel/py-meson/patches: patch-mesonbuild_compilers_____init____.py patch-mesonbuild_compilers_compilers.py Log Message: py-meson: Identify GCC on SunOS and behave accordingly. Fixes build of devel/dconf. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-meson/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-meson/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_____init____.py \ pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py cvs rdiff -u -r1.1 -r1.2 \ 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. --_----------=_1526375077141130 Content-Disposition: inline Content-Length: 6868 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-meson/Makefile diff -u pkgsrc/devel/py-meson/Makefile:1.10 pkgsrc/devel/py-meson/Makefile:1.11 --- pkgsrc/devel/py-meson/Makefile:1.10 Mon May 14 09:43:15 2018 +++ pkgsrc/devel/py-meson/Makefile Tue May 15 09:04:36 2018 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2018/05/14 09:43:15 jperkin Exp $ +# $NetBSD: Makefile,v 1.11 2018/05/15 09:04:36 jperkin Exp $ DISTNAME= meson-0.44.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/} Index: pkgsrc/devel/py-meson/distinfo diff -u pkgsrc/devel/py-meson/distinfo:1.8 pkgsrc/devel/py-meson/distinfo:1.9 --- pkgsrc/devel/py-meson/distinfo:1.8 Mon May 14 09:43:15 2018 +++ pkgsrc/devel/py-meson/distinfo Tue May 15 09:04:36 2018 @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.8 2018/05/14 09:43:15 jperkin Exp $ +$NetBSD: distinfo,v 1.9 2018/05/15 09:04:36 jperkin Exp $ SHA1 (meson-0.44.1.tar.gz) = 7ac668ee883c4075aa5348e5daedf4c737a6925d RMD160 (meson-0.44.1.tar.gz) = 1257a3e2b5f6837a59ef4cdf632a00bba1ff601d SHA512 (meson-0.44.1.tar.gz) = 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d Size (meson-0.44.1.tar.gz) = 1136337 bytes -SHA1 (patch-mesonbuild_environment.py) = e560b77dde989639ef54281fcdd402cfd9eb2d64 +SHA1 (patch-mesonbuild_compilers_____init____.py) = b893759a6fa135f2da606ea487848701dbba037d +SHA1 (patch-mesonbuild_compilers_compilers.py) = 8e86265c2db294846582ce92d91c220761a82853 +SHA1 (patch-mesonbuild_environment.py) = 08957ccc7ee55f9d5b7f965309bbe5ad38aa23ce SHA1 (patch-mesonbuild_scripts_meson__install.py) = 2a3185ac5814a23040ebe44b21c45c0115daa7ed Index: pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py diff -u pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py:1.1 pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py:1.2 --- pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py:1.1 Mon May 14 09:43:15 2018 +++ pkgsrc/devel/py-meson/patches/patch-mesonbuild_environment.py Tue May 15 09:04:37 2018 @@ -1,10 +1,27 @@ -$NetBSD: patch-mesonbuild_environment.py,v 1.1 2018/05/14 09:43:15 jperkin Exp $ +$NetBSD: patch-mesonbuild_environment.py,v 1.2 2018/05/15 09:04:37 jperkin Exp $ -Support SunOS ar. +Support SunOS ar and SunOS-specific GCC behaviour. --- mesonbuild/environment.py.orig 2018-02-20 21:48:57.000000000 +0000 +++ mesonbuild/environment.py -@@ -779,6 +779,8 @@ class Environment: +@@ -29,6 +29,7 @@ from .compilers import ( + GCC_CYGWIN, + GCC_MINGW, + GCC_OSX, ++ GCC_SUNOS, + GCC_STANDARD, + ICC_STANDARD, + is_assembly, +@@ -409,6 +410,8 @@ class Environment: + # Detect GCC type (Apple, MinGW, Cygwin, Unix) + if '__APPLE__' in defines: + return GCC_OSX ++ elif '__sun' in defines: ++ return GCC_SUNOS + elif '__MINGW32__' in defines or '__MINGW64__' in defines: + return GCC_MINGW + elif '__CYGWIN__' in defines: +@@ -779,6 +782,8 @@ class Environment: return ArLinker(linker) if p.returncode == 1 and err.startswith('usage'): # OSX return ArLinker(linker) Added files: Index: pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_____init____.py diff -u /dev/null pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_____init____.py:1.1 --- /dev/null Tue May 15 09:04:37 2018 +++ pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_____init____.py Tue May 15 09:04:37 2018 @@ -0,0 +1,22 @@ +$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, Index: pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py diff -u /dev/null pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py:1.1 --- /dev/null Tue May 15 09:04:37 2018 +++ pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py Tue May 15 09:04:37 2018 @@ -0,0 +1,57 @@ +$NetBSD: patch-mesonbuild_compilers_compilers.py,v 1.1 2018/05/15 09:04:37 jperkin Exp $ + +Support SunOS-specific GCC behaviour. +Limit GNU ld options correctly. + +--- mesonbuild/compilers/compilers.py.orig 2018-02-20 21:48:57.000000000 +0000 ++++ mesonbuild/compilers/compilers.py +@@ -134,6 +134,14 @@ gnulike_buildtype_linker_args = {'plain' + 'minsize': [], + } + ++sunos_buildtype_linker_args = {'plain': [], ++ 'debug': [], ++ 'debugoptimized': [], ++ 'release': [], ++ 'minsize': [], ++ } ++ ++ + msvc_buildtype_linker_args = {'plain': [], + 'debug': [], + 'debugoptimized': [], +@@ -853,7 +861,7 @@ class Compiler: + else: + paths = paths + ':' + padding + args = ['-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 +@@ -876,6 +884,7 @@ GCC_STANDARD = 0 + GCC_OSX = 1 + GCC_MINGW = 2 + GCC_CYGWIN = 3 ++GCC_SUNOS = 4 + + CLANG_STANDARD = 0 + CLANG_OSX = 1 +@@ -891,7 +900,7 @@ def get_gcc_soname_args(gcc_type, prefix + sostr = '' + else: + sostr = '.' + soversion +- if gcc_type in (GCC_STANDARD, GCC_MINGW, GCC_CYGWIN): ++ if gcc_type in (GCC_STANDARD, GCC_MINGW, GCC_CYGWIN, GCC_SUNOS): + # Might not be correct for mingw but seems to work. + return ['-Wl,-soname,%s%s.%s%s' % (prefix, shlib_name, suffix, sostr)] + elif gcc_type == GCC_OSX: +@@ -1023,6 +1032,8 @@ class GnuCompiler: + def get_buildtype_linker_args(self, buildtype): + if self.gcc_type == GCC_OSX: + return apple_buildtype_linker_args[buildtype] ++ elif self.gcc_type == GCC_SUNOS: ++ return sunos_buildtype_linker_args[buildtype] + return gnulike_buildtype_linker_args[buildtype] + + def get_pch_suffix(self): --_----------=_1526375077141130--