Index: head/emulators/py-unicorn/Makefile =================================================================== --- head/emulators/py-unicorn/Makefile (revision 439797) +++ head/emulators/py-unicorn/Makefile (revision 439798) @@ -1,27 +1,27 @@ # $FreeBSD$ PORTNAME= unicorn -PORTVERSION= 1.0 +PORTVERSION= 1.0.1 CATEGORIES= emulators python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= antoine@FreeBSD.org COMMENT= Python bindings for Unicorn CPU emulator framework LICENSE= BSD3CLAUSE LIB_DEPENDS= libunicorn.so:emulators/unicorn USE_GITHUB= yes GH_ACCOUNT= unicorn-engine USES= python USE_PYTHON= distutils autoplist WRKSRC_SUBDIR= bindings/python do-test: @(cd ${WRKSRC}; for sample in sample_*.py; do \ ${SETENV} ${TEST_ENV} ${PYTHON_CMD} $${sample}; \ done) .include Index: head/emulators/py-unicorn/distinfo =================================================================== --- head/emulators/py-unicorn/distinfo (revision 439797) +++ head/emulators/py-unicorn/distinfo (revision 439798) @@ -1,3 +1,3 @@ -TIMESTAMP = 1487917142 -SHA256 (unicorn-engine-unicorn-1.0_GH0.tar.gz) = 27efa24e465f3eca9a1fa8f7f456f6fecd91beeba0b4be21b34308040047def9 -SIZE (unicorn-engine-unicorn-1.0_GH0.tar.gz) = 3214697 +TIMESTAMP = 1492722479 +SHA256 (unicorn-engine-unicorn-1.0.1_GH0.tar.gz) = 3a6a4f2b8c405ab009040ca43af8e4aa10ebe44d9c8b336aa36dc35df955017c +SIZE (unicorn-engine-unicorn-1.0.1_GH0.tar.gz) = 3241225 Index: head/emulators/py-unicorn/files/patch-setup.py =================================================================== --- head/emulators/py-unicorn/files/patch-setup.py (revision 439797) +++ head/emulators/py-unicorn/files/patch-setup.py (revision 439798) @@ -1,16 +1,16 @@ # Do not bundle libunicorn.so ---- setup.py.orig 2017-02-23 12:57:14 UTC +--- setup.py.orig 2017-04-20 06:14:24 UTC +++ setup.py @@ -260,11 +260,4 @@ setup( 'Programming Language :: Python :: 3', ], requires=['ctypes'], - cmdclass=cmdclass, - zip_safe=True, - include_package_data=True, - is_pure=True, - package_data={ - 'unicorn': ['lib/*', 'include/unicorn/*'] - } ) Index: head/emulators/unicorn/Makefile =================================================================== --- head/emulators/unicorn/Makefile (revision 439797) +++ head/emulators/unicorn/Makefile (revision 439798) @@ -1,32 +1,32 @@ # $FreeBSD$ PORTNAME= unicorn -PORTVERSION= 1.0 +PORTVERSION= 1.0.1 CATEGORIES= emulators MAINTAINER= antoine@FreeBSD.org COMMENT= Unicorn CPU emulator framework LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= cmocka>0:sysutils/cmocka USE_GITHUB= yes GH_ACCOUNT= unicorn-engine USES= gmake python:2.7,build USE_LDCONFIG= yes MAKE_ENV= INSTALL_LIB="${INSTALL_LIB}" \ UNICORN_QEMU_FLAGS=--python=${PYTHON_CMD} \ - MAKE_JOBS_NUMBER=${MAKE_JOBS_NUMBER} \ + SMP_MFLAGS=-j${MAKE_JOBS_NUMBER} \ V=1 TEST_TARGET= test TEST_WRKSRC= ${WRKSRC}/tests/unit _MAKE_JOBS= # MAKE_JOBS_NUMBER is passed via MAKE_ENV # Optimization breaks runtime, # see https://github.com/unicorn-engine/unicorn/issues/356 # and https://github.com/unicorn-engine/unicorn/issues/689 CFLAGS:= ${CFLAGS:C/-O[1-9]/-O0/g} .include Index: head/emulators/unicorn/distinfo =================================================================== --- head/emulators/unicorn/distinfo (revision 439797) +++ head/emulators/unicorn/distinfo (revision 439798) @@ -1,3 +1,3 @@ -TIMESTAMP = 1487917142 -SHA256 (unicorn-engine-unicorn-1.0_GH0.tar.gz) = 27efa24e465f3eca9a1fa8f7f456f6fecd91beeba0b4be21b34308040047def9 -SIZE (unicorn-engine-unicorn-1.0_GH0.tar.gz) = 3214697 +TIMESTAMP = 1492722479 +SHA256 (unicorn-engine-unicorn-1.0.1_GH0.tar.gz) = 3a6a4f2b8c405ab009040ca43af8e4aa10ebe44d9c8b336aa36dc35df955017c +SIZE (unicorn-engine-unicorn-1.0.1_GH0.tar.gz) = 3241225 Index: head/emulators/unicorn/files/patch-Makefile =================================================================== --- head/emulators/unicorn/files/patch-Makefile (revision 439797) +++ head/emulators/unicorn/files/patch-Makefile (revision 439798) @@ -1,32 +1,23 @@ ---- Makefile.orig 2017-02-23 12:57:14 UTC +--- Makefile.orig 2017-04-20 06:14:24 UTC +++ Makefile -@@ -62,9 +62,9 @@ V ?= 0 +@@ -72,9 +72,9 @@ V ?= 0 MACOS_UNIVERSAL ?= yes ifeq ($(UNICORN_DEBUG),yes) -CFLAGS += -g +#CFLAGS += -g else -CFLAGS += -O3 +#CFLAGS += -O3 UNICORN_QEMU_FLAGS += --disable-debug-info endif -@@ -171,7 +171,7 @@ LIBDIRARCH ?= lib +@@ -181,7 +181,7 @@ LIBDIRARCH ?= lib # Or better, pass 'LIBDIRARCH=lib64' to 'make install/uninstall' via 'make.sh'. #LIBDIRARCH ?= lib64 -LIBDIR ?= $(PREFIX)/$(LIBDIRARCH) +LIBDIR = $(PREFIX)/$(LIBDIRARCH) INCDIR ?= $(PREFIX)/include BINDIR ?= $(PREFIX)/bin -@@ -204,7 +204,7 @@ qemu/config-host.h-timestamp: - cd qemu && \ - ./configure --cc="${CC}" --extra-cflags="$(UNICORN_CFLAGS)" --target-list="$(UNICORN_TARGETS)" ${UNICORN_QEMU_FLAGS} - printf "$(UNICORN_ARCHS)" > config.log -- $(MAKE) -C qemu -j 4 -+ $(MAKE) -C qemu -j $(MAKE_JOBS_NUMBER) - $(eval UC_TARGET_OBJ += $$(wildcard qemu/util/*.o) $$(wildcard qemu/*.o) $$(wildcard qemu/qom/*.o) $$(wildcard qemu/hw/core/*.o) $$(wildcard qemu/qapi/*.o) $$(wildcard qemu/qobject/*.o)) - - unicorn: $(LIBRARY) $(ARCHIVE) Index: head/emulators/unicorn/files/patch-qemu_configure =================================================================== --- head/emulators/unicorn/files/patch-qemu_configure (revision 439797) +++ head/emulators/unicorn/files/patch-qemu_configure (revision 439798) @@ -1,18 +1,18 @@ ---- qemu/configure.orig 2017-02-23 12:57:14 UTC +--- qemu/configure.orig 2017-04-20 06:14:24 UTC +++ qemu/configure @@ -229,11 +229,11 @@ QEMU_CFLAGS="-Wstrict-prototypes -Wredun QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/include" if test "$debug_info" = "yes"; then - CFLAGS="-g $CFLAGS" - LDFLAGS="-g $LDFLAGS" +# CFLAGS="-g $CFLAGS" +# LDFLAGS="-g $LDFLAGS" else - CFLAGS="-O3 $CFLAGS" - LDFLAGS="-O3 $LDFLAGS" +# CFLAGS="-O3 $CFLAGS" +# LDFLAGS="-O3 $LDFLAGS" fi # make source path absolute Index: head/emulators/unicorn/files/patch-tests_unit_Makefile =================================================================== --- head/emulators/unicorn/files/patch-tests_unit_Makefile (revision 439797) +++ head/emulators/unicorn/files/patch-tests_unit_Makefile (revision 439798) @@ -1,10 +1,10 @@ ---- tests/unit/Makefile.orig 2017-02-23 12:57:14 UTC +--- tests/unit/Makefile.orig 2017-04-20 06:14:24 UTC +++ tests/unit/Makefile @@ -1,6 +1,6 @@ CFLAGS += -Wall -Werror -Wno-unused-function -g CFLAGS += -L ../../ -I ../../include -CFLAGS += -L ../../cmocka/src -I ../../cmocka/include +CFLAGS += -L $(LOCALBASE)/lib -I $(LOCALBASE)/include UNAME_S := $(shell uname -s) ifeq ($(UNAME_S), Linux)