Received: by mail.netbsd.org (Postfix, from userid 605) id 0145384D80; Fri, 8 Mar 2019 11:34:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7B02A84D7B for ; Fri, 8 Mar 2019 11:34:50 +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 yIY7C-t1KOL4 for ; Fri, 8 Mar 2019 11:34:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E84DB84D51 for ; Fri, 8 Mar 2019 11:34:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E2E28FB16; Fri, 8 Mar 2019 11:34:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1552044889131500" MIME-Version: 1.0 Date: Fri, 8 Mar 2019 11:34:49 +0000 From: "Patrick Welche" Subject: CVS commit: pkgsrc/devel/py-meson To: pkgsrc-changes@NetBSD.org Reply-To: prlw1@netbsd.org X-Mailer: log_accum Message-Id: <20190308113449.E2E28FB16@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. --_----------=_1552044889131500 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: prlw1 Date: Fri Mar 8 11:34:49 UTC 2019 Modified Files: pkgsrc/devel/py-meson: Makefile distinfo pkgsrc/devel/py-meson/patches: patch-mesonbuild_compilers_compilers.py Log Message: Attempt at fixing SunOS support after further breakage report from jperkin. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/py-meson/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-meson/distinfo cvs rdiff -u -r1.4 -r1.5 \ pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1552044889131500 Content-Disposition: inline Content-Length: 3199 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.16 pkgsrc/devel/py-meson/Makefile:1.17 --- pkgsrc/devel/py-meson/Makefile:1.16 Thu Mar 7 13:48:17 2019 +++ pkgsrc/devel/py-meson/Makefile Fri Mar 8 11:34:49 2019 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2019/03/07 13:48:17 prlw1 Exp $ +# $NetBSD: Makefile,v 1.17 2019/03/08 11:34:49 prlw1 Exp $ DISTNAME= meson-0.49.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/} Index: pkgsrc/devel/py-meson/distinfo diff -u pkgsrc/devel/py-meson/distinfo:1.15 pkgsrc/devel/py-meson/distinfo:1.16 --- pkgsrc/devel/py-meson/distinfo:1.15 Thu Mar 7 13:48:17 2019 +++ pkgsrc/devel/py-meson/distinfo Fri Mar 8 11:34:49 2019 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.15 2019/03/07 13:48:17 prlw1 Exp $ +$NetBSD: distinfo,v 1.16 2019/03/08 11:34:49 prlw1 Exp $ SHA1 (meson-0.49.2.tar.gz) = 9c16f7a72ea15669efdcbc7ac01cf3e00ffb55c8 RMD160 (meson-0.49.2.tar.gz) = 6ce4677fedba1bff8e4174a16c4361d1364b0abd SHA512 (meson-0.49.2.tar.gz) = 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d Size (meson-0.49.2.tar.gz) = 1340730 bytes -SHA1 (patch-mesonbuild_compilers_compilers.py) = 0365a7e97be4e1a5e2c466610853d90ff2eeb0ed +SHA1 (patch-mesonbuild_compilers_compilers.py) = 118aaa4de372b744252bfa0969dbe2fe1bada88e SHA1 (patch-mesonbuild_environment.py) = f599ec7c708037002da5d9ee4ca0ccfb31b2e307 SHA1 (patch-mesonbuild_minstall.py) = 64bcbdac0d37cabd114349de34646820893bb212 Index: pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py diff -u pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py:1.4 pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py:1.5 --- pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py:1.4 Thu Mar 7 13:48:17 2019 +++ pkgsrc/devel/py-meson/patches/patch-mesonbuild_compilers_compilers.py Fri Mar 8 11:34:49 2019 @@ -1,4 +1,4 @@ -$NetBSD: patch-mesonbuild_compilers_compilers.py,v 1.4 2019/03/07 13:48:17 prlw1 Exp $ +$NetBSD: patch-mesonbuild_compilers_compilers.py,v 1.5 2019/03/08 11:34:49 prlw1 Exp $ Support SunOS-specific GCC behaviour. Limit GNU ld options correctly. @@ -48,6 +48,15 @@ Limit GNU ld options correctly. def is_windows_compiler(self): return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN', 'ARM_WIN', 'CCRX_WIN') +@@ -1330,7 +1343,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): +- if compiler_type.is_standard_compiler: ++ if compiler_type.is_standard_compiler or compiler_type.is_sunos_compiler: + 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: @@ -1359,6 +1372,7 @@ def get_compiler_uses_gnuld(c): CompilerType.GCC_STANDARD, CompilerType.GCC_MINGW, --_----------=_1552044889131500--