CVS commit: pkgsrc/devel/py-hash

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

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Sat Jun 30 19:01:52 UTC 2018

Modified Files:
        pkgsrc/devel/py-hash: Makefile distinfo
        pkgsrc/devel/py-hash/patches: patch-setup.py

Log Message:
devel/py-hash: Fix build with versioned boost_python lib.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-hash/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-hash/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-hash/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/devel/py-hash/Makefile
diff -u pkgsrc/devel/py-hash/Makefile:1.5 pkgsrc/devel/py-hash/Makefile:1.6
--- pkgsrc/devel/py-hash/Makefile:1.5   Sun Jul 30 22:32:16 2017
+++ pkgsrc/devel/py-hash/Makefile       Sat Jun 30 19:01:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/07/30 22:32:16 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/06/30 19:01:52 fhajny Exp $
 
 DISTNAME=      pyfasthash-0.6.2
 PKGNAME=       ${DISTNAME:S/pyfast/${PYPKGPREFIX}-/}
@@ -16,6 +16,8 @@ USE_LANGUAGES=        c c++
 
 EGG_NAME=      ${DISTNAME:S/fast//}
 
+MAKE_ENV+=     PYVER=${_PYTHON_VERSION}
+
 .include "../../mk/endian.mk"
 .if ${MACHINE_ENDIAN} == "little"
 CPPFLAGS+=     -DHASH_LITTLE_ENDIAN=1 -DHASH_BIG_ENDIAN=0

Index: pkgsrc/devel/py-hash/distinfo
diff -u pkgsrc/devel/py-hash/distinfo:1.2 pkgsrc/devel/py-hash/distinfo:1.3
--- pkgsrc/devel/py-hash/distinfo:1.2   Tue Jun 21 18:00:02 2016
+++ pkgsrc/devel/py-hash/distinfo       Sat Jun 30 19:01:52 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2016/06/21 18:00:02 joerg Exp $
+$NetBSD: distinfo,v 1.3 2018/06/30 19:01:52 fhajny Exp $
 
 SHA1 (pyfasthash-0.6.2.tar.gz) = e703ff597cd8db8bfd83f44f0e42e7ac9153c302
 RMD160 (pyfasthash-0.6.2.tar.gz) = 3a6e3f5015c8b2c8d4a7f2bc04ef0ca7f75eabb6
 SHA512 (pyfasthash-0.6.2.tar.gz) = 1820a56f27dd58d1aff4657230b1e5c9b276d64fc1573ad5c14612efd92d584070f12414a9e4fd9929eb61e054a6d65dc6ce1f25457431eaf736c38ecb6fc9be
 Size (pyfasthash-0.6.2.tar.gz) = 197576 bytes
 SHA1 (patch-pyhash.py) = 6e9428959693b72c8efe50ed272b8c1610a682c5
-SHA1 (patch-setup.py) = e993f644120ab43eb4853624fc78de0bb33b8880
+SHA1 (patch-setup.py) = ec7181e8027470634e9b6aa4d6d141ee77ffb74e
 SHA1 (patch-src_fnv_fnv.h) = c942d2bb434ffdc99a6110781bf66e5cb878a889
 SHA1 (patch-src_lookup3_lookup3.c) = 85e5be79ddf7050af7e98858610323accdaba453

Index: pkgsrc/devel/py-hash/patches/patch-setup.py
diff -u pkgsrc/devel/py-hash/patches/patch-setup.py:1.2 pkgsrc/devel/py-hash/patches/patch-setup.py:1.3
--- pkgsrc/devel/py-hash/patches/patch-setup.py:1.2     Tue Jun 21 18:00:02 2016
+++ pkgsrc/devel/py-hash/patches/patch-setup.py Sat Jun 30 19:01:52 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.2 2016/06/21 18:00:02 joerg Exp $
+$NetBSD: patch-setup.py,v 1.3 2018/06/30 19:01:52 fhajny Exp $
 
 print is a function in Python 3.
 
@@ -12,25 +12,19 @@ print is a function in Python 3.
  
  from ez_setup import use_setuptools
  use_setuptools()
-@@ -56,14 +57,22 @@ elif os.name == "posix" and sys.platform
+@@ -56,14 +57,16 @@ elif os.name == "posix" and sys.platform
          '/opt/local/include',
          '/usr/local/include'
      ]
 -    libraries += ["boost_python-mt"]
 -    extra_compile_args += ["-msse4.2"]
-+    if sys.version_info.major == 2:
-+        libraries += ["boost_python-mt"]
-+    else:
-+        libraries += ["boost_python3-mt"]
++    libraries += ["boost_python" + os.environ.get('PYVER') + "-mt"]
 +    if platform.machine() in ("i386", "amd64"):
 +        extra_compile_args += ["-msse4.2"]
  elif os.name == "posix":
 -    libraries += ["boost_python", "rt"]
 -    extra_compile_args += ["-msse4.2"]
-+    if sys.version_info.major == 2:
-+        libraries += ["boost_python", "rt"]
-+    else:
-+        libraries += ["boost_python3", "rt"]
++    libraries += ["boost_python" + os.environ.get('PYVER'), "rt"]
 +    if platform.machine() in ("i386", "amd64"):
 +        extra_compile_args += ["-msse4.2"]