CVS commit: pkgsrc/devel

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sat Mar 24 17:10:42 UTC 2018

Modified Files:
        pkgsrc/devel/capstone: Makefile.common distinfo
        pkgsrc/devel/py-capstone: Makefile PLIST
Added Files:
        pkgsrc/devel/capstone/patches:
            patch-bindings_python_capstone_____init____.py
            patch-bindings_python_setup.py

Log Message:
Don't build capstone locally in the Python binding.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/capstone/Makefile.common
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/capstone/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/capstone/patches/patch-bindings_python_capstone_____init____.py \
    pkgsrc/devel/capstone/patches/patch-bindings_python_setup.py
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-capstone/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-capstone/PLIST

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

Modified files:

Index: pkgsrc/devel/capstone/Makefile.common
diff -u pkgsrc/devel/capstone/Makefile.common:1.2 pkgsrc/devel/capstone/Makefile.common:1.3
--- pkgsrc/devel/capstone/Makefile.common:1.2   Fri Feb 23 02:42:06 2018
+++ pkgsrc/devel/capstone/Makefile.common       Sat Mar 24 17:10:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2018/02/23 02:42:06 khorben Exp $
+# $NetBSD: Makefile.common,v 1.3 2018/03/24 17:10:42 joerg Exp $
 #
 # used by devel/py-capstone/Makefile
 
@@ -10,3 +10,4 @@ GITHUB_TAG=   3.0.5-rc2
 HOMEPAGE=      http://www.capstone-engine.org/
 
 DISTINFO_FILE= ${.CURDIR}/../../devel/capstone/distinfo
+PATCHDIR=      ${.CURDIR}/../../devel/capstone/patches

Index: pkgsrc/devel/capstone/distinfo
diff -u pkgsrc/devel/capstone/distinfo:1.10 pkgsrc/devel/capstone/distinfo:1.11
--- pkgsrc/devel/capstone/distinfo:1.10 Fri Feb 23 02:42:06 2018
+++ pkgsrc/devel/capstone/distinfo      Sat Mar 24 17:10:42 2018
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.10 2018/02/23 02:42:06 khorben Exp $
+$NetBSD: distinfo,v 1.11 2018/03/24 17:10:42 joerg Exp $
 
 SHA1 (capstone-3.0.5rc2.tar.gz) = 52052e754c4f92128d16d5b028b85f646547f091
 RMD160 (capstone-3.0.5rc2.tar.gz) = 960473fc8f4b7113adc291b768e668e27a7c8b56
 SHA512 (capstone-3.0.5rc2.tar.gz) = 31bafdb0b3183d0c054a4244cc135db9a3c3dc5cb2e2af706bfede0d53cca8cba81d74b74ef9a4adbfd6c79cc408864dd80b8203791e17bd6c98bb69ea4f6894
 Size (capstone-3.0.5rc2.tar.gz) = 2829338 bytes
+SHA1 (patch-bindings_python_capstone_____init____.py) = a634a7fb27da8c9a391504d42801180293ec767c
+SHA1 (patch-bindings_python_setup.py) = 8d209df5d7ed4b2cc8283394fd1ec9659ab86a72
 SHA1 (patch-cstool_Makefile) = 94c029a1f667ceffad787f056c332c11001344df

Index: pkgsrc/devel/py-capstone/Makefile
diff -u pkgsrc/devel/py-capstone/Makefile:1.4 pkgsrc/devel/py-capstone/Makefile:1.5
--- pkgsrc/devel/py-capstone/Makefile:1.4       Fri Feb 23 02:42:06 2018
+++ pkgsrc/devel/py-capstone/Makefile   Sat Mar 24 17:10:42 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2018/02/23 02:42:06 khorben Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/24 17:10:42 joerg Exp $
 
 .include "../../devel/capstone/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES+=   python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -13,5 +14,5 @@ WRKSRC=               ${WRKDIR}/capstone-${GITHUB_TAG
 PYSETUPSUBDIR= bindings/python
 
 .include "../../devel/capstone/buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-capstone/PLIST
diff -u pkgsrc/devel/py-capstone/PLIST:1.2 pkgsrc/devel/py-capstone/PLIST:1.3
--- pkgsrc/devel/py-capstone/PLIST:1.2  Fri Feb 23 02:42:06 2018
+++ pkgsrc/devel/py-capstone/PLIST      Sat Mar 24 17:10:42 2018
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2018/02/23 02:42:06 khorben Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
-${PYSITELIB}/${EGG_FILE}/zip-safe
+@comment $NetBSD: PLIST,v 1.3 2018/03/24 17:10:42 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/capstone/__init__.py
 ${PYSITELIB}/capstone/__init__.pyc
 ${PYSITELIB}/capstone/__init__.pyo
@@ -29,8 +29,6 @@ ${PYSITELIB}/capstone/include/capstone/s
 ${PYSITELIB}/capstone/include/capstone/systemz.h
 ${PYSITELIB}/capstone/include/capstone/x86.h
 ${PYSITELIB}/capstone/include/capstone/xcore.h
-${PYSITELIB}/capstone/lib/libcapstone.a
-${PYSITELIB}/capstone/lib/libcapstone.so
 ${PYSITELIB}/capstone/mips.py
 ${PYSITELIB}/capstone/mips.pyc
 ${PYSITELIB}/capstone/mips.pyo

Added files:

Index: pkgsrc/devel/capstone/patches/patch-bindings_python_capstone_____init____.py
diff -u /dev/null pkgsrc/devel/capstone/patches/patch-bindings_python_capstone_____init____.py:1.1
--- /dev/null   Sat Mar 24 17:10:42 2018
+++ pkgsrc/devel/capstone/patches/patch-bindings_python_capstone_____init____.py        Sat Mar 24 17:10:42 2018
@@ -0,0 +1,13 @@
+$NetBSD: patch-bindings_python_capstone_____init____.py,v 1.1 2018/03/24 17:10:42 joerg Exp $
+
+--- bindings/python/capstone/__init__.py.orig  2017-03-02 14:21:24.000000000 +0000
++++ bindings/python/capstone/__init__.py
+@@ -214,7 +214,7 @@ else:
+ _found = False
+ 
+ def _load_lib(path):
+-    lib_file = join(path, _lib)
++    lib_file = join(sys.prefix, 'lib', _lib)
+     try:
+         return ctypes.cdll.LoadLibrary(lib_file)
+     except OSError:
Index: pkgsrc/devel/capstone/patches/patch-bindings_python_setup.py
diff -u /dev/null pkgsrc/devel/capstone/patches/patch-bindings_python_setup.py:1.1
--- /dev/null   Sat Mar 24 17:10:42 2018
+++ pkgsrc/devel/capstone/patches/patch-bindings_python_setup.py        Sat Mar 24 17:10:42 2018
@@ -0,0 +1,18 @@
+$NetBSD: patch-bindings_python_setup.py,v 1.1 2018/03/24 17:10:42 joerg Exp $
+
+--- bindings/python/setup.py.orig      2018-03-24 13:56:27.958002410 +0000
++++ bindings/python/setup.py
+@@ -129,11 +129,9 @@ def build_libraries():
+         # Do not build tests & static library
+         os.system('cmake -DCMAKE_BUILD_TYPE=RELEASE -DCAPSTONE_BUILD_TESTS=0 -DCAPSTONE_BUILD_STATIC=0 -G "NMake Makefiles" ..')
+         os.system("nmake")
+-    else:   # Unix incl. cygwin
+-        os.system("CAPSTONE_BUILD_CORE_ONLY=yes bash ./make.sh")
+ 
+-    shutil.copy(LIBRARY_FILE, LIBS_DIR)
+-    if STATIC_LIBRARY_FILE: shutil.copy(STATIC_LIBRARY_FILE, LIBS_DIR)
++    #shutil.copy(LIBRARY_FILE, LIBS_DIR)
++    #if STATIC_LIBRARY_FILE: shutil.copy(STATIC_LIBRARY_FILE, LIBS_DIR)
+     os.chdir(cwd)
+ 
+