On Tue Sep 04, 2018 at 01:55:54AM +0200, Fabian Raetz wrote:
> Hi @ports.
>
> I've added math/z3 as a LIB_DEPENDS to lang/solidity in openbsd-wip. It seems
> that libz3 is not setup correctly?
>
> Here's my attempt to fix it. Does that make sense?
>
> Cheers,
> Fabian
>
>
Hi Fabian Raetz,
nice catch. All in all, okay but you remove libz3 from ${LOCALBASE}/lib.
New diff below, could you test with your solidity wip port?
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/z3/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile 19 Jun 2018 17:48:49 -0000 1.7
+++ Makefile 15 Sep 2018 10:14:27 -0000
@@ -4,10 +4,13 @@ COMMENT = z3 theorem prover
VERSION = 4.7.1
DISTNAME = z3-${VERSION}
+REVISION = 0
GH_ACCOUNT = Z3Prover
GH_PROJECT = z3
+SHARED_LIBS = z3 0.0
+
CATEGORIES = math
WANTLIB += c m pthread ${COMPILER_LIBCXX}
@@ -26,6 +29,9 @@ COMPILER = base-clang ports-gcc
MODULES = lang/python
WRKDIST = ${WRKDIR}/z3-${DISTNAME}
+
+pre-configure:
+ ${SUBST_CMD} ${WRKSRC}/scripts/mk_util.py
do-build:
cd ${WRKSRC}/build && make
Index: patches/patch-scripts_mk_util_py
===================================================================
RCS file: patches/patch-scripts_mk_util_py
diff -N patches/patch-scripts_mk_util_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-scripts_mk_util_py 15 Sep 2018 10:14:27 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: scripts/mk_util.py
+--- scripts/mk_util.py.orig
++++ scripts/mk_util.py
+@@ -49,7 +49,7 @@ C_COMPILERS=['gcc', 'clang']
+ CSC_COMPILERS=['csc', 'mcs']
+ JAVAC=None
+ JAR=None
+-PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib()
++PYTHON_PACKAGE_DIR=distutils.sysconfig.get_python_lib(prefix=getenv("LOCALBASE",
None))
+ BUILD_DIR='build'
+ REV_BUILD_DIR='..'
+ SRC_DIR='src'
+@@ -2528,7 +2528,7 @@ def mk_config():
+ elif sysname == 'OpenBSD':
+ CXXFLAGS = '%s -D_OPENBSD_' % CXXFLAGS
+ OS_DEFINES = '-D_OPENBSD_'
+- SO_EXT = '.so'
++ SO_EXT = '.so.${LIBz3_VERSION}'
+ SLIBFLAGS = '-shared'
+ elif sysname.startswith('CYGWIN'):
+ CXXFLAGS = '%s -D_CYGWIN' % CXXFLAGS
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/z3/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST 10 Apr 2018 08:17:38 -0000 1.2
+++ pkg/PLIST 15 Sep 2018 10:14:27 -0000
@@ -14,12 +14,12 @@ include/z3_polynomial.h
include/z3_rcf.h
include/z3_spacer.h
include/z3_v1.h
-lib/libz3.so
+@lib lib/libz3.so.${LIBz3_VERSION}
lib/python${MODPY_VERSION}/site-packages/z3/
lib/python${MODPY_VERSION}/site-packages/z3/__init__.py
lib/python${MODPY_VERSION}/site-packages/z3/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/z3/lib/
-lib/python${MODPY_VERSION}/site-packages/z3/lib/libz3.so
+@lib lib/python${MODPY_VERSION}/site-packages/z3/lib/libz3.so.${LIBz3_VERSION}
lib/python${MODPY_VERSION}/site-packages/z3/z3.py
lib/python${MODPY_VERSION}/site-packages/z3/z3.pyc
lib/python${MODPY_VERSION}/site-packages/z3/z3consts.py
