CVS commit: pkgsrc/emulators/unicorn

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Oct 21 19:09:11 UTC 2021

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

Log Message:
unicorn: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/unicorn/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/emulators/unicorn/distinfo
cvs rdiff -u -r1.2 -r1.3 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.16 pkgsrc/emulators/unicorn/Makefile:1.17
--- pkgsrc/emulators/unicorn/Makefile:1.16      Thu Feb 25 19:51:29 2021
+++ pkgsrc/emulators/unicorn/Makefile   Thu Oct 21 19:09:10 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/02/25 19:51:29 leot Exp $
+# $NetBSD: Makefile,v 1.17 2021/10/21 19:09:10 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -12,6 +12,7 @@ USE_TOOLS+=   gmake pkg-config
 
 MAKE_ENV+=     UNICORN_QEMU_FLAGS=--python=${PYTHONBIN:Q}
 MAKE_ENV+=     UNICORN_QEMU_FLAGS=--extra-ldflags=\"${LDFLAGS:Q}\"
+MAKE_ENV+=     CONFIG_SHELL=${CONFIG_SHELL:Q}
 
 ALL_ENV+=      USE_GENERIC_LIBDATADIR=yes
 

Index: pkgsrc/emulators/unicorn/distinfo
diff -u pkgsrc/emulators/unicorn/distinfo:1.8 pkgsrc/emulators/unicorn/distinfo:1.9
--- pkgsrc/emulators/unicorn/distinfo:1.8       Thu Oct  7 13:49:51 2021
+++ pkgsrc/emulators/unicorn/distinfo   Thu Oct 21 19:09:10 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2021/10/07 13:49:51 nia Exp $
+$NetBSD: distinfo,v 1.9 2021/10/21 19:09:10 jperkin Exp $
 
 RMD160 (unicorn-1.0.2.tar.gz) = 1e9c125e12afcc9674f9e85f56c14d6807b98a80
 SHA512 (unicorn-1.0.2.tar.gz) = e459c849407ce3e42e40035953f6236f69518d0626ba5233ca4a36e0c70f50f7bac56ecfe4432a9741ac178d982192f588c6cc9795eb2a38c95a04de741fa33c
 Size (unicorn-1.0.2.tar.gz) = 3735111 bytes
-SHA1 (patch-Makefile) = 1c69fa8838ad53397811bbe29fc41914dbcbdc6a
+SHA1 (patch-Makefile) = a4cee3d8f880515e10dd053a6d2e93ea019f34d7
 SHA1 (patch-bindings_python_setup.py) = 035888ce0599abb8ef4670fffb051cb1510d9a29
 SHA1 (patch-bindings_python_unicorn_unicorn.py) = d7653d205bc999b8c53941c161771b8f72fcfa6e

Index: pkgsrc/emulators/unicorn/patches/patch-Makefile
diff -u pkgsrc/emulators/unicorn/patches/patch-Makefile:1.2 pkgsrc/emulators/unicorn/patches/patch-Makefile:1.3
--- pkgsrc/emulators/unicorn/patches/patch-Makefile:1.2 Thu Feb 25 19:47:51 2021
+++ pkgsrc/emulators/unicorn/patches/patch-Makefile     Thu Oct 21 19:09:10 2021
@@ -1,8 +1,29 @@
-$NetBSD: patch-Makefile,v 1.2 2021/02/25 19:47:51 leot Exp $
+$NetBSD: patch-Makefile,v 1.3 2021/10/21 19:09:10 jperkin Exp $
 
 --- Makefile.orig      2020-10-21 11:34:41.000000000 +0000
 +++ Makefile
-@@ -305,10 +305,10 @@ $(LIBRARY): $(UC_OBJ_ALL)
+@@ -218,7 +218,11 @@ else
+ EXT = so
+ VERSION_EXT = $(EXT).$(API_MAJOR)
+ AR_EXT = a
++ifneq ($(filter SunOS%,$(UNAME_S)),)
++$(LIBNAME)_LDFLAGS += -Wl,-soname,lib$(LIBNAME).$(VERSION_EXT)
++else
+ $(LIBNAME)_LDFLAGS += -Wl,-Bsymbolic-functions,-soname,lib$(LIBNAME).$(VERSION_EXT)
++endif
+ UNICORN_CFLAGS += -fvisibility=hidden
+ endif
+ 
+@@ -290,7 +294,7 @@ all: unicorn
+ 
+ qemu/config-host.mak: qemu/configure
+       cd qemu && \
+-      ./configure --cc="${CC}" --extra-cflags="$(UNICORN_CFLAGS)" --target-list="$(UNICORN_TARGETS)" ${UNICORN_QEMU_FLAGS}
++      $(CONFIG_SHELL) ./configure --cc="${CC}" --extra-cflags="$(UNICORN_CFLAGS)" --target-list="$(UNICORN_TARGETS)" ${UNICORN_QEMU_FLAGS}
+       @printf "$(UNICORN_ARCHS)" > config.log
+ 
+ uc.o: qemu/config-host.mak FORCE
+@@ -305,10 +309,10 @@ $(LIBRARY): $(UC_OBJ_ALL)
  ifeq ($(UNICORN_SHARED),yes)
  ifeq ($(V),0)
        $(call log,GEN,$(LIBRARY))