CVS commit: pkgsrc/emulators/unicorn

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Dec 31 13:14:51 UTC 2019

Modified Files:
        pkgsrc/emulators/unicorn: Makefile distinfo
Added Files:
        pkgsrc/emulators/unicorn/patches: patch-Makefile

Log Message:
unicorn: update to 1.0.1nb2.

Use LDFLAGS -- fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/emulators/unicorn/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/unicorn/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/unicorn/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/emulators/unicorn/Makefile
diff -u pkgsrc/emulators/unicorn/Makefile:1.11 pkgsrc/emulators/unicorn/Makefile:1.12
--- pkgsrc/emulators/unicorn/Makefile:1.11      Sun Nov  3 19:24:34 2019
+++ pkgsrc/emulators/unicorn/Makefile   Tue Dec 31 13:14:51 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2019/11/03 19:24:34 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2019/12/31 13:14:51 wiz Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "Makefile.common"
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,6 +14,7 @@ PYTHON_VERSIONS_ACCEPTED=     27 # as of 1.0
 .include "../../lang/python/application.mk"
 
 MAKE_ENV+=     UNICORN_QEMU_FLAGS=--python=${PYTHONBIN:Q}
+MAKE_ENV+=     UNICORN_QEMU_FLAGS=--extra-ldflags=\"${LDFLAGS:Q}\"
 
 ALL_ENV+=      USE_GENERIC_LIBDATADIR=yes
 

Index: pkgsrc/emulators/unicorn/distinfo
diff -u pkgsrc/emulators/unicorn/distinfo:1.5 pkgsrc/emulators/unicorn/distinfo:1.6
--- pkgsrc/emulators/unicorn/distinfo:1.5       Sat Mar 24 17:09:34 2018
+++ pkgsrc/emulators/unicorn/distinfo   Tue Dec 31 13:14:51 2019
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2018/03/24 17:09:34 joerg Exp $
+$NetBSD: distinfo,v 1.6 2019/12/31 13:14:51 wiz Exp $
 
 SHA1 (unicorn-1.0.1.tar.gz) = 85c9d7aad2a87b110b729560ed9333b66018ca6a
 RMD160 (unicorn-1.0.1.tar.gz) = 599b7ce96fe4040a48561bd9474666583265960b
 SHA512 (unicorn-1.0.1.tar.gz) = edfe1f7bfbc1d20f5b62232057e194a937bc09db686ef2efadb33a54605029a53426432cdb2a29511385aacdb9343b3b3091af50a1909098d7cf6db3429eb966
 Size (unicorn-1.0.1.tar.gz) = 3241225 bytes
+SHA1 (patch-Makefile) = c050394e6bac19022f897e5c5952690a2f74bf09
 SHA1 (patch-bindings_python_setup.py) = 35b6a68a75e18bf6a0e8f7c745fee2e148f26c1c
 SHA1 (patch-bindings_python_unicorn_unicorn.py) = 0835b53b508400f0ca8464f09262c4c64a9a8a54

Added files:

Index: pkgsrc/emulators/unicorn/patches/patch-Makefile
diff -u /dev/null pkgsrc/emulators/unicorn/patches/patch-Makefile:1.1
--- /dev/null   Tue Dec 31 13:14:51 2019
+++ pkgsrc/emulators/unicorn/patches/patch-Makefile     Tue Dec 31 13:14:51 2019
@@ -0,0 +1,17 @@
+$NetBSD: patch-Makefile,v 1.1 2019/12/31 13:14:51 wiz Exp $
+
+--- Makefile.orig      2017-04-20 06:14:24.000000000 +0000
++++ Makefile
+@@ -223,10 +223,10 @@ $(LIBRARY): qemu/config-host.h-timestamp
+ ifeq ($(UNICORN_SHARED),yes)
+ ifeq ($(V),0)
+       $(call log,GEN,$(LIBRARY))
+-      @$(CC) $(CFLAGS) -shared $(UC_TARGET_OBJ) uc.o list.o -o $(LIBRARY) $($(LIBNAME)_LDFLAGS)
++      @$(CC) $(CFLAGS) -shared $(UC_TARGET_OBJ) uc.o list.o -o $(LIBRARY) $($(LIBNAME)_LDFLAGS) $(LDFLAGS)
+       @-ln -sf $(LIBRARY) $(LIBRARY_SYMLINK)
+ else
+-      $(CC) $(CFLAGS) -shared $(UC_TARGET_OBJ) uc.o list.o -o $(LIBRARY) $($(LIBNAME)_LDFLAGS)
++      $(CC) $(CFLAGS) -shared $(UC_TARGET_OBJ) uc.o list.o -o $(LIBRARY) $($(LIBNAME)_LDFLAGS) $(LDFLAGS)
+       -ln -sf $(LIBRARY) $(LIBRARY_SYMLINK)
+ endif
+ ifeq ($(DO_WINDOWS_EXPORT),1)