CVS commit: pkgsrc/net/py-zmq

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Thu Feb  2 11:53:58 UTC 2017

Modified Files:
        pkgsrc/net/py-zmq: distinfo
Added Files:
        pkgsrc/net/py-zmq/patches: patch-buildutils_detect.py patch-setup.py

Log Message:
Stop messing with compiler/linker bitness on SunOS. Let pkgsrc and compiler do its job.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/net/py-zmq/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/py-zmq/patches/patch-buildutils_detect.py
cvs rdiff -u -r0 -r1.3 pkgsrc/net/py-zmq/patches/patch-setup.py

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

Modified files:

Index: pkgsrc/net/py-zmq/distinfo
diff -u pkgsrc/net/py-zmq/distinfo:1.10 pkgsrc/net/py-zmq/distinfo:1.11
--- pkgsrc/net/py-zmq/distinfo:1.10     Thu Feb  2 10:16:30 2017
+++ pkgsrc/net/py-zmq/distinfo  Thu Feb  2 11:53:58 2017
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.10 2017/02/02 10:16:30 fhajny Exp $
+$NetBSD: distinfo,v 1.11 2017/02/02 11:53:58 fhajny Exp $
 
 SHA1 (pyzmq-16.0.2.tar.gz) = ad91c8d50f4c85e2e321511914d2420ad3603c49
 RMD160 (pyzmq-16.0.2.tar.gz) = 7973c1c58a515ece5b97b74eda8d7a057ec018a8
 SHA512 (pyzmq-16.0.2.tar.gz) = 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96
 Size (pyzmq-16.0.2.tar.gz) = 1026531 bytes
+SHA1 (patch-buildutils_detect.py) = 829ad2337dfb2cf0aabd9fde0e0806802d8c7da4
+SHA1 (patch-setup.py) = e03b101b23f2dd61bdd82743b7abeb57520898da

Added files:

Index: pkgsrc/net/py-zmq/patches/patch-buildutils_detect.py
diff -u /dev/null pkgsrc/net/py-zmq/patches/patch-buildutils_detect.py:1.1
--- /dev/null   Thu Feb  2 11:53:58 2017
+++ pkgsrc/net/py-zmq/patches/patch-buildutils_detect.py        Thu Feb  2 11:53:58 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-buildutils_detect.py,v 1.1 2017/02/02 11:53:58 fhajny Exp $
+
+Let compiler decide what's best.
+
+--- buildutils/detect.py.orig  2016-11-22 12:41:00.000000000 +0000
++++ buildutils/detect.py
+@@ -47,11 +47,6 @@ def test_compilation(cfile, compiler=Non
+         else:
+             # allow for missing UB arch, since it will still work:
+             lpreargs = ['-undefined', 'dynamic_lookup']
+-    if sys.platform == 'sunos5':
+-        if platform.architecture()[0]=='32bit':
+-            lpreargs = ['-m32']
+-        else: 
+-            lpreargs = ['-m64']
+     extra = compiler_attrs.get('extra_compile_args', None)
+ 
+     objs = cc.compile([cfile], extra_preargs=cpreargs, extra_postargs=extra)

Index: pkgsrc/net/py-zmq/patches/patch-setup.py
diff -u /dev/null pkgsrc/net/py-zmq/patches/patch-setup.py:1.3
--- /dev/null   Thu Feb  2 11:53:58 2017
+++ pkgsrc/net/py-zmq/patches/patch-setup.py    Thu Feb  2 11:53:58 2017
@@ -0,0 +1,19 @@
+$NetBSD: patch-setup.py,v 1.3 2017/02/02 11:53:58 fhajny Exp $
+
+Let compiler decide what's best.
+
+--- setup.py.orig      2016-11-22 12:41:00.000000000 +0000
++++ setup.py
+@@ -203,12 +203,6 @@ def settings_from_prefix(prefix=None, bu
+         if sys.platform.startswith('freebsd'):
+             settings['libraries'].append('pthread')
+ 
+-        if sys.platform.startswith('sunos'):
+-          if platform.architecture()[0] == '32bit':
+-            settings['extra_link_args'] += ['-m32']
+-          else:
+-            settings['extra_link_args'] += ['-m64']
+-
+         if prefix:
+             settings['libraries'].append('zmq')
+