CVS commit: pkgsrc/x11/py-sip

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jan 26 15:47:18 UTC 2018

Modified Files:
        pkgsrc/x11/py-sip: Makefile distinfo
        pkgsrc/x11/py-sip/patches: patch-siputils.py

Log Message:
py-sip: Fix linker flags with SunOS/clang.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/x11/py-sip/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/py-sip/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/py-sip/patches/patch-siputils.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/py-sip/Makefile
diff -u pkgsrc/x11/py-sip/Makefile:1.50 pkgsrc/x11/py-sip/Makefile:1.51
--- pkgsrc/x11/py-sip/Makefile:1.50     Thu Jan 25 14:08:59 2018
+++ pkgsrc/x11/py-sip/Makefile  Fri Jan 26 15:47:18 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2018/01/25 14:08:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2018/01/26 15:47:18 jperkin Exp $
 
 DISTNAME=      sip-4.19.5
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    x11 devel python
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pyqt/}
 

Index: pkgsrc/x11/py-sip/distinfo
diff -u pkgsrc/x11/py-sip/distinfo:1.39 pkgsrc/x11/py-sip/distinfo:1.40
--- pkgsrc/x11/py-sip/distinfo:1.39     Thu Jan 18 05:07:04 2018
+++ pkgsrc/x11/py-sip/distinfo  Fri Jan 26 15:47:18 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2018/01/18 05:07:04 markd Exp $
+$NetBSD: distinfo,v 1.40 2018/01/26 15:47:18 jperkin Exp $
 
 SHA1 (sip-4.19.5.tar.gz) = 654f02563bf0b67253abcee3e2249acfdfb21b08
 RMD160 (sip-4.19.5.tar.gz) = d7b2b3bfd8f350c6be1d6bfe9d3761ad1cb73320
@@ -7,4 +7,4 @@ Size (sip-4.19.5.tar.gz) = 1019157 bytes
 SHA1 (patch-aa) = 813eeed9d8608a2049e3cc819d31876afdada3aa
 SHA1 (patch-ab) = a331efb38a1fadd799e00be34f076c8b8f6e3071
 SHA1 (patch-sipgen_gencode.c) = a9abb5e9fa488ef46864f5c25e1e353494c43378
-SHA1 (patch-siputils.py) = 8e5cccfb5e17df54550fc352df35c4065ef36b65
+SHA1 (patch-siputils.py) = fa69e6b957697cdb9afb3c44d9d4b42ab8a604f3

Index: pkgsrc/x11/py-sip/patches/patch-siputils.py
diff -u pkgsrc/x11/py-sip/patches/patch-siputils.py:1.2 pkgsrc/x11/py-sip/patches/patch-siputils.py:1.3
--- pkgsrc/x11/py-sip/patches/patch-siputils.py:1.2     Thu Aug 21 21:32:39 2014
+++ pkgsrc/x11/py-sip/patches/patch-siputils.py Fri Jan 26 15:47:18 2018
@@ -1,8 +1,9 @@
-$NetBSD: patch-siputils.py,v 1.2 2014/08/21 21:32:39 wiz Exp $
+$NetBSD: patch-siputils.py,v 1.3 2018/01/26 15:47:18 jperkin Exp $
 
 Fix build on Darwin with pkgsrc python.
+Fix SunOS/clang.
 
---- siputils.py.orig   2014-05-10 15:00:48.000000000 +0000
+--- siputils.py.orig   2015-03-25 11:00:24.000000000 +0000
 +++ siputils.py
 @@ -258,6 +258,9 @@ class Makefile:
          self._installs = installs
@@ -14,3 +15,17 @@ Fix build on Darwin with pkgsrc python.
          # Make sure the destination directory is an absolute path.
          if dir:
              self.dir = os.path.abspath(dir)
+@@ -1596,10 +1599,10 @@ class ModuleMakefile(Makefile):
+                     if sys.platform[:5] == 'linux':
+                         self.LFLAGS.extend(['-Wl,--version-script=%s.exp' % self._target])
+                     elif sys.platform[:5] == 'sunos':
+-                        if self.required_string('LINK') == 'g++':
+-                            self.LFLAGS.extend(['-Wl,-z,noversion', '-Wl,-M,%s.exp' % self._target])
+-                        else:
++                        if self.required_string('LINK') == 'CC':
+                             self.LFLAGS.extend(['-z' 'noversion', '-M', '%s.exp' % self._target])
++                        else:
++                            self.LFLAGS.extend(['-Wl,-z,noversion', '-Wl,-M,%s.exp' % self._target])
+                     elif sys.platform[:5] == 'hp-ux':
+                         self.LFLAGS.extend(['-Wl,+e,%s' % self._entry_point])
+                     elif sys.platform[:5] == 'irix' and self.required_string('LINK') != 'g++':