View | Details | Raw Unified | Return to bug 278478 | Differences between
and this patch

Collapse All | Expand All

(-)b/Mk/Uses/angr.mk (-1 / +1 lines)
Lines 32-38 IGNORE= USES=angr: invalid argument: ${_arg} Link Here
32
.  endfor
32
.  endfor
33
33
34
# Set the default angr version for all angr-related ports.
34
# Set the default angr version for all angr-related ports.
35
ANGR_VERSION?=		9.0.5405
35
ANGR_VERSION?=		9.2.99
36
ANGR_BINARIES_TAGNAME?=	v${ANGR_VERSION}
36
ANGR_BINARIES_TAGNAME?=	v${ANGR_VERSION}
37
37
38
.  if "${angr_ARGS:Mbinaries}" != ""
38
.  if "${angr_ARGS:Mbinaries}" != ""
(-)b/devel/py-archinfo/Makefile (-1 / +3 lines)
Lines 11-23 WWW= https://github.com/angr/archinfo Link Here
11
LICENSE=	BSD2CLAUSE
11
LICENSE=	BSD2CLAUSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
13
14
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
14
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyvex>0:security/py-pyvex@${PY_FLAVOR} \
16
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyvex>0:security/py-pyvex@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}unicorn>0:emulators/py-unicorn@${PY_FLAVOR}
17
		${PYTHON_PKGNAMEPREFIX}unicorn>0:emulators/py-unicorn@${PY_FLAVOR}
16
18
17
USES=		angr:nose python
19
USES=		angr:nose python
18
USE_GITHUB=	yes
20
USE_GITHUB=	yes
19
GH_ACCOUNT=	angr
21
GH_ACCOUNT=	angr
20
USE_PYTHON=	autoplist distutils
22
USE_PYTHON=	autoplist pep517
21
23
22
NO_ARCH=	yes
24
NO_ARCH=	yes
23
25
(-)b/devel/py-archinfo/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1610804750
1
TIMESTAMP = 1713585429
2
SHA256 (angr-archinfo-v9.0.5405_GH0.tar.gz) = 4de7bfca3d2e7ef4f80eaec13b7910c44f16ac184fa128971b8f6c7d6ca6a6ec
2
SHA256 (angr-archinfo-v9.2.99_GH0.tar.gz) = 54a2ae7862acc73822ff06bb31535d45ee62576b30bf986a36bfd96182c9ad46
3
SIZE (angr-archinfo-v9.0.5405_GH0.tar.gz) = 50412
3
SIZE (angr-archinfo-v9.2.99_GH0.tar.gz) = 58747
(-)b/devel/py-cle/Makefile (-1 / +3 lines)
Lines 11-16 WWW= https://github.com/angr/cle Link Here
11
LICENSE=	BSD2CLAUSE
11
LICENSE=	BSD2CLAUSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
13
14
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
14
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} \
16
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}minidump>0:devel/py-minidump@${PY_FLAVOR} \
17
		${PYTHON_PKGNAMEPREFIX}minidump>0:devel/py-minidump@${PY_FLAVOR} \
16
		${PYTHON_PKGNAMEPREFIX}pefile>0:devel/py-pefile@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}pefile>0:devel/py-pefile@${PY_FLAVOR} \
Lines 21-27 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR} \ Link Here
21
USES=		angr:binaries,nose python
23
USES=		angr:binaries,nose python
22
USE_GITHUB=	yes
24
USE_GITHUB=	yes
23
GH_ACCOUNT=	angr
25
GH_ACCOUNT=	angr
24
USE_PYTHON=	autoplist distutils
26
USE_PYTHON=	autoplist pep517
25
27
26
NO_ARCH=	yes
28
NO_ARCH=	yes
27
29
(-)b/devel/py-cle/distinfo (-5 / +5 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1610804807
1
TIMESTAMP = 1713585602
2
SHA256 (angr-cle-v9.0.5405_GH0.tar.gz) = 1fa06355ec6610be4ed8da53b59465fe5b5aefaf8f9ce9e878443b626e654918
2
SHA256 (angr-cle-v9.2.99_GH0.tar.gz) = 3df5877726c2ff6e6b893f970197327d817e8ca52da9632463f8287512d14763
3
SIZE (angr-cle-v9.0.5405_GH0.tar.gz) = 128633
3
SIZE (angr-cle-v9.2.99_GH0.tar.gz) = 183245
4
SHA256 (angr-binaries-v9.0.5405_GH0.tar.gz) = c6cf9e357450d485ff9f32bba6f495e7a0336178b6d8dde1bb16430da8b58efe
4
SHA256 (angr-binaries-v9.2.99_GH0.tar.gz) = 98b7fe89557818fa0f243a2b9ecfb3e5aa4d716549e3b0ec7dbff3c9bf1543c4
5
SIZE (angr-binaries-v9.0.5405_GH0.tar.gz) = 57764618
5
SIZE (angr-binaries-v9.2.99_GH0.tar.gz) = 88167061
(-)b/math/py-claripy/Makefile (-1 / +3 lines)
Lines 11-16 WWW= https://github.com/angr/claripy Link Here
11
LICENSE=	BSD2CLAUSE
11
LICENSE=	BSD2CLAUSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
13
14
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
14
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cachetools>0:devel/py-cachetools@${PY_FLAVOR} \
16
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cachetools>0:devel/py-cachetools@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
17
		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
16
		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
Lines 21-27 TEST_DEPENDS= z3>4.8.5.0:math/z3 Link Here
21
USES=		angr:nose python
23
USES=		angr:nose python
22
USE_GITHUB=	yes
24
USE_GITHUB=	yes
23
GH_ACCOUNT=	angr
25
GH_ACCOUNT=	angr
24
USE_PYTHON=	autoplist distutils
26
USE_PYTHON=	autoplist pep517
25
27
26
NO_ARCH=	yes
28
NO_ARCH=	yes
27
29
(-)b/math/py-claripy/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1610804749
1
TIMESTAMP = 1713585889
2
SHA256 (angr-claripy-v9.0.5405_GH0.tar.gz) = e800cde64da99712c2b3b2e13640c7ed209811a7cf6a908ad76ee969a136eaa2
2
SHA256 (angr-claripy-v9.2.99_GH0.tar.gz) = 31b54cdfa355fe22a02c80f37302e92a07e1ccf8dda180cfc9496aa1820b3f60
3
SIZE (angr-claripy-v9.0.5405_GH0.tar.gz) = 152473
3
SIZE (angr-claripy-v9.2.99_GH0.tar.gz) = 164433
(-)b/security/py-ailment/Makefile (-1 / +3 lines)
Lines 11-16 WWW= https://github.com/angr/pyvex Link Here
11
LICENSE=	BSD2CLAUSE
11
LICENSE=	BSD2CLAUSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
13
14
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
14
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}angr>=${ANGR_VERSION}:security/py-angr@${PY_FLAVOR} \
16
TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}angr>=${ANGR_VERSION}:security/py-angr@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}archinfo>=${ANGR_VERSION}:devel/py-archinfo@${PY_FLAVOR} \
17
		${PYTHON_PKGNAMEPREFIX}archinfo>=${ANGR_VERSION}:devel/py-archinfo@${PY_FLAVOR} \
16
		${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \
18
		${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \
Lines 19-25 TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}angr>=${ANGR_VERSION}:security/py-angr@${PY Link Here
19
USES=		angr:binaries,nose gmake localbase python
21
USES=		angr:binaries,nose gmake localbase python
20
USE_GITHUB=	yes
22
USE_GITHUB=	yes
21
GH_ACCOUNT=	angr
23
GH_ACCOUNT=	angr
22
USE_PYTHON=	autoplist distutils
24
USE_PYTHON=	autoplist pep517
23
25
24
NO_ARCH=	yes
26
NO_ARCH=	yes
25
27
(-)b/security/py-ailment/distinfo (-5 / +5 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1610804805
1
TIMESTAMP = 1713585789
2
SHA256 (angr-ailment-v9.0.5405_GH0.tar.gz) = 6ab6952fe68c7440d09765cb3cc4c95d3616fb393d9cfba1f3a5ca7b67f45cff
2
SHA256 (angr-ailment-v9.2.99_GH0.tar.gz) = 7d1e17bd0e85ca0a3f69a9472155de476df0cd580637c734fe3835438beb0d1a
3
SIZE (angr-ailment-v9.0.5405_GH0.tar.gz) = 10716
3
SIZE (angr-ailment-v9.2.99_GH0.tar.gz) = 30052
4
SHA256 (angr-binaries-v9.0.5405_GH0.tar.gz) = c6cf9e357450d485ff9f32bba6f495e7a0336178b6d8dde1bb16430da8b58efe
4
SHA256 (angr-binaries-v9.2.99_GH0.tar.gz) = 98b7fe89557818fa0f243a2b9ecfb3e5aa4d716549e3b0ec7dbff3c9bf1543c4
5
SIZE (angr-binaries-v9.0.5405_GH0.tar.gz) = 57764618
5
SIZE (angr-binaries-v9.2.99_GH0.tar.gz) = 88167061
(-)b/security/py-angr/Makefile (-3 / +4 lines)
Lines 1-7 Link Here
1
PORTNAME=	angr
1
PORTNAME=	angr
2
DISTVERSIONPREFIX=	v
2
DISTVERSIONPREFIX=	v
3
DISTVERSION=	${ANGR_VERSION}
3
DISTVERSION=	${ANGR_VERSION}
4
PORTREVISION=	2
5
CATEGORIES=	security devel python
4
CATEGORIES=	security devel python
6
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
5
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
7
6
Lines 13-19 LICENSE= BSD3CLAUSE Link Here
13
LICENSE_FILE=	${WRKSRC}/LICENSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
14
13
15
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \
14
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyvex>=${ANGR_VERSION}:security/py-pyvex@${PY_FLAVOR} \
16
		${PYTHON_PKGNAMEPREFIX}unicorn>0:emulators/py-unicorn@${PY_FLAVOR}
15
		${PYTHON_PKGNAMEPREFIX}unicorn>0:emulators/py-unicorn@${PY_FLAVOR} \
16
		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
17
		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
17
LIB_DEPENDS=	libunicorn.so:emulators/unicorn \
18
LIB_DEPENDS=	libunicorn.so:emulators/unicorn \
18
		libz3.so:math/z3
19
		libz3.so:math/z3
19
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ailment>=${ANGR_VERSION}:security/py-ailment@${PY_FLAVOR} \
20
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ailment>=${ANGR_VERSION}:security/py-ailment@${PY_FLAVOR} \
Lines 42-48 TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}keystone-engine>=0:devel/py-keystone-engine Link Here
42
43
43
USES=		angr:binaries gmake localbase:ldflags python
44
USES=		angr:binaries gmake localbase:ldflags python
44
USE_GITHUB=	yes
45
USE_GITHUB=	yes
45
USE_PYTHON=	autoplist distutils
46
USE_PYTHON=	autoplist pep517
46
47
47
TEST_ENV=	${MAKE_ENV} \
48
TEST_ENV=	${MAKE_ENV} \
48
		NOSE_EXCLUDE="${_NOSE_EXCLUDE}"
49
		NOSE_EXCLUDE="${_NOSE_EXCLUDE}"
(-)b/security/py-angr/distinfo (-7 / +5 lines)
Lines 1-7 Link Here
1
TIMESTAMP = 1610804805
1
TIMESTAMP = 1713585066
2
SHA256 (angr-angr-v9.0.5405_GH0.tar.gz) = 27f634399b1e92e3715e595b44f4f1a41f2b1ba0b9e667c46ad7702f89d5dfd7
2
SHA256 (angr-angr-v9.2.99_GH0.tar.gz) = 9203154c0db824a04de223501dc4704338a4e902053e6529e8eb9a3201b64a95
3
SIZE (angr-angr-v9.0.5405_GH0.tar.gz) = 1481177
3
SIZE (angr-angr-v9.2.99_GH0.tar.gz) = 3363812
4
SHA256 (angr-binaries-v9.0.5405_GH0.tar.gz) = c6cf9e357450d485ff9f32bba6f495e7a0336178b6d8dde1bb16430da8b58efe
4
SHA256 (angr-binaries-v9.2.99_GH0.tar.gz) = 98b7fe89557818fa0f243a2b9ecfb3e5aa4d716549e3b0ec7dbff3c9bf1543c4
5
SIZE (angr-binaries-v9.0.5405_GH0.tar.gz) = 57764618
5
SIZE (angr-binaries-v9.2.99_GH0.tar.gz) = 88167061
6
SHA256 (44748a8e8a298dafc88c513c8ba5f716b3b90be2.patch) = bff05690e7d57fced470953db39ad1ef25219917238ea08ed0e1d9bb2cbbb66a
7
SIZE (44748a8e8a298dafc88c513c8ba5f716b3b90be2.patch) = 923
(-)a/security/py-angr/files/patch-setup.py (-11 lines)
Removed Link Here
1
--- setup.py.orig	2020-09-24 20:13:28 UTC
2
+++ setup.py
3
@@ -129,7 +129,7 @@ if 'bdist_wheel' in sys.argv and '--plat-name' not in 
4
         # https://www.python.org/dev/peps/pep-0425/
5
         sys.argv.append(name.replace('.', '_').replace('-', '_'))
6
 
7
-_UNICORN = "unicorn==1.0.2rc4"
8
+_UNICORN = "unicorn>=1.0.2rc4"
9
 
10
 setup(
11
     name='angr',
(-)b/security/py-pyvex/Makefile (-4 / +4 lines)
Lines 18-24 LICENSE_FILE_GPLv3= ${WRKSRC}/pyvex_c/LICENSE Link Here
18
ONLY_FOR_ARCHS=		aarch64 amd64 armv7 i386
18
ONLY_FOR_ARCHS=		aarch64 amd64 armv7 i386
19
ONLY_FOR_ARCHS_REASON=	pyvex_c/pyvex.c does not support this architecture (see line 170)
19
ONLY_FOR_ARCHS_REASON=	pyvex_c/pyvex.c does not support this architecture (see line 170)
20
20
21
BUILD_DEPENDS=	${_MY_DEPENDS}
21
BUILD_DEPENDS=	${_MY_DEPENDS} \
22
		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
23
		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
22
RUN_DEPENDS=	${_MY_DEPENDS} \
24
RUN_DEPENDS=	${_MY_DEPENDS} \
23
		${PYTHON_PKGNAMEPREFIX}archinfo>=${DISTVERSION}:devel/py-archinfo@${PY_FLAVOR} \
25
		${PYTHON_PKGNAMEPREFIX}archinfo>=${DISTVERSION}:devel/py-archinfo@${PY_FLAVOR} \
24
		${PYTHON_PKGNAMEPREFIX}bitstring>0:devel/py-bitstring@${PY_FLAVOR} \
26
		${PYTHON_PKGNAMEPREFIX}bitstring>0:devel/py-bitstring@${PY_FLAVOR} \
Lines 33-39 USE_CSTD= c99 Link Here
33
USE_GITHUB=	nodefault
35
USE_GITHUB=	nodefault
34
GH_TUPLE=	angr:${PORTNAME}:v${DISTVERSION}:tests
36
GH_TUPLE=	angr:${PORTNAME}:v${DISTVERSION}:tests
35
USE_LDCONFIG=	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/lib
37
USE_LDCONFIG=	${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/lib
36
USE_PYTHON=	autoplist distutils
38
USE_PYTHON=	autoplist pep517
37
39
38
MAKE_ENV=	EXTRA_CFLAGS="${CFLAGS}"
40
MAKE_ENV=	EXTRA_CFLAGS="${CFLAGS}"
39
41
Lines 43-50 post-patch: Link Here
43
	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|g' \
45
	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|g' \
44
		-e 's|%%LDFLAGS%%|${LDFLAGS}|g' \
46
		-e 's|%%LDFLAGS%%|${LDFLAGS}|g' \
45
		${WRKSRC}/pyvex_c/Makefile
47
		${WRKSRC}/pyvex_c/Makefile
46
	@${REINPLACE_CMD} -e 's|%%MAKE_JOBS_NUMBER%%|${MAKE_JOBS_NUMBER}|g' \
47
		${WRKSRC}/setup.py
48
48
49
post-install:
49
post-install:
50
	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/lib/lib${PORTNAME}*.so
50
	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/lib/lib${PORTNAME}*.so
(-)b/security/py-pyvex/distinfo (-7 / +7 lines)
Lines 1-7 Link Here
1
TIMESTAMP = 1626098519
1
TIMESTAMP = 1713504548
2
SHA256 (pyvex-9.0.5405.tar.gz) = 6d34fb801432b6c5f95ab6b86c462d3aec8c93b751544dad3b40ba7d12984c29
2
SHA256 (pyvex-9.2.99.tar.gz) = cb7d084772fe6e0400da02649a29e4224cf5fd41f6eedb879f41249349ad8219
3
SIZE (pyvex-9.0.5405.tar.gz) = 1767188
3
SIZE (pyvex-9.2.99.tar.gz) = 3663860
4
SHA256 (angr-pyvex-v9.0.5405_GH0.tar.gz) = 63d3b4ca662c052a714e83e1d573ccf5865004cfd63cdbd5fb85b533864651be
4
SHA256 (angr-pyvex-v9.2.99_GH0.tar.gz) = 3febd3dae9a999445402e8f05713ae49f31241ba86267ad323bf57618d5b063b
5
SIZE (angr-pyvex-v9.0.5405_GH0.tar.gz) = 87680
5
SIZE (angr-pyvex-v9.2.99_GH0.tar.gz) = 98221
6
SHA256 (angr-binaries-v9.0.5405_GH0.tar.gz) = c6cf9e357450d485ff9f32bba6f495e7a0336178b6d8dde1bb16430da8b58efe
6
SHA256 (angr-binaries-v9.2.99_GH0.tar.gz) = 98b7fe89557818fa0f243a2b9ecfb3e5aa4d716549e3b0ec7dbff3c9bf1543c4
7
SIZE (angr-binaries-v9.0.5405_GH0.tar.gz) = 57764618
7
SIZE (angr-binaries-v9.2.99_GH0.tar.gz) = 88167061
(-)b/security/py-pyvex/files/patch-pyvex__c_Makefile (-1 / +1 lines)
Lines 16-22 Link Here
16
 qs = $(subst ?,$(sp),$1)
16
 qs = $(subst ?,$(sp),$1)
17
 sq = $(subst $(sp),?,$1)
17
 sq = $(subst $(sp),?,$1)
18
 
18
 
19
-CC=gcc
19
-CC?=gcc
20
-AR=ar
20
-AR=ar
21
+CC?=gcc
21
+CC?=gcc
22
+AR?=ar
22
+AR?=ar
(-)a/security/py-pyvex/files/patch-setup.py (-29 lines)
Removed Link Here
1
--- setup.py.orig	2020-01-08 00:58:26 UTC
2
+++ setup.py
3
@@ -73,10 +73,8 @@ def _build_vex():
4
     e['MULTIARCH'] = '1'
5
     e['DEBUG'] = '1'
6
 
7
-    cmd1 = ['nmake', '/f', 'Makefile-msvc', 'all']
8
-    cmd2 = ['make', '-f', 'Makefile-gcc', '-j', str(multiprocessing.cpu_count()), 'all']
9
-    cmd3 = ['gmake', '-f', 'Makefile-gcc', '-j', str(multiprocessing.cpu_count()), 'all']
10
-    for cmd in (cmd1, cmd2, cmd3):
11
+    cmd3 = ['gmake', '-f', 'Makefile-gcc', '-j', '%%MAKE_JOBS_NUMBER%%', 'all']
12
+    for cmd in (cmd3,):
13
         try:
14
             if subprocess.call(cmd, cwd=VEX_PATH, env=e) == 0:
15
                 break
16
@@ -91,10 +89,8 @@ def _build_pyvex():
17
     e['VEX_INCLUDE_PATH'] = os.path.join(VEX_PATH, 'pub')
18
     e['VEX_LIB_FILE'] = os.path.join(VEX_PATH, 'libvex.lib')
19
 
20
-    cmd1 = ['nmake', '/f', 'Makefile-msvc']
21
-    cmd2 = ['make', '-j', str(multiprocessing.cpu_count())]
22
-    cmd3 = ['gmake', '-j', str(multiprocessing.cpu_count())]
23
-    for cmd in (cmd1, cmd2, cmd3):
24
+    cmd3 = ['gmake', '-j', '%%MAKE_JOBS_NUMBER%%']
25
+    for cmd in (cmd3,):
26
         try:
27
             if subprocess.call(cmd, cwd='pyvex_c', env=e) == 0:
28
                 break
29
- 

Return to bug 278478