CVS commit: pkgsrc/devel/py-meson

["Patrick Welche" <prlw1%netbsd.org@localhost>]

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.

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,