CVS commit: pkgsrc/math/z3

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Fri Feb 23 17:04:43 UTC 2018

Modified Files:
        pkgsrc/math/z3: distinfo
        pkgsrc/math/z3/patches: patch-scripts_mk__util.py

Log Message:
Add support for DESTDIR

Fix building math/z3 in privileged mode when not building as root:
ocamlfind: Cannot mkdir /usr/pkg/lib/ocaml/site-lib/Z3: Permission denied

This now uses the option -destdir when calling ocamlfind(1). It also
includes a workaround for what might be a bug in ocamlfind(1), where it
also wants to update ld.conf in spite of specifying -destdir.

Tested on NetBSD/amd64.

ok dholland@


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/z3/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/z3/patches/patch-scripts_mk__util.py

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

Modified files:

Index: pkgsrc/math/z3/distinfo
diff -u pkgsrc/math/z3/distinfo:1.2 pkgsrc/math/z3/distinfo:1.3
--- pkgsrc/math/z3/distinfo:1.2 Sat Jul 16 04:02:13 2016
+++ pkgsrc/math/z3/distinfo     Fri Feb 23 17:04:43 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2016/07/16 04:02:13 markd Exp $
+$NetBSD: distinfo,v 1.3 2018/02/23 17:04:43 khorben Exp $
 
 SHA1 (z3-4.4.1.tar.gz) = 60094acaa53459ec694899aca9f17aa830875610
 RMD160 (z3-4.4.1.tar.gz) = 2c891e115a5d097dbbda53c1b322c65bc5b679f7
@@ -8,6 +8,6 @@ SHA1 (z3-jumbo-patch-20151123.gz) = d31b
 RMD160 (z3-jumbo-patch-20151123.gz) = eb74bd41125e1b07a7f873774a2c354e3c8ca378
 SHA512 (z3-jumbo-patch-20151123.gz) = c23d363bf53b40c3ccbfc10d03ef3621d6abfa9cf86375e7e853e85a0971db70992173df04df1a895e16d4a9b533e955953455a7533889963d2920a4b48d0056
 Size (z3-jumbo-patch-20151123.gz) = 4395 bytes
-SHA1 (patch-scripts_mk__util.py) = 1ab32d86649c5b3e83e9b20632d21018a1e22617
+SHA1 (patch-scripts_mk__util.py) = 84ccd3fa33a3fcffa53af6f838f6caacdfec40a8
 SHA1 (patch-src_util_debug.cpp) = 607ea4e078884920a3034cf00779dce25fc8e623
 SHA1 (patch-src_util_mpz.cpp) = 69988bec1472df14209ae0dbfdc8a94c9e71cc82

Index: pkgsrc/math/z3/patches/patch-scripts_mk__util.py
diff -u pkgsrc/math/z3/patches/patch-scripts_mk__util.py:1.1 pkgsrc/math/z3/patches/patch-scripts_mk__util.py:1.2
--- pkgsrc/math/z3/patches/patch-scripts_mk__util.py:1.1        Tue Nov 24 05:45:58 2015
+++ pkgsrc/math/z3/patches/patch-scripts_mk__util.py    Fri Feb 23 17:04:43 2018
@@ -1,11 +1,12 @@
-$NetBSD: patch-scripts_mk__util.py,v 1.1 2015/11/24 05:45:58 dholland Exp $
+$NetBSD: patch-scripts_mk__util.py,v 1.2 2018/02/23 17:04:43 khorben Exp $
 
 For pkgsrc, use site-packages rather than dist-packages.
+Add support for DESTDIR.
 
 diff -r 59247c69b92d scripts/mk_util.py
---- scripts/mk_util.py Mon Nov 23 19:08:36 2015 -0500
-+++ scripts/mk_util.py Mon Nov 23 19:50:45 2015 -0500
-@@ -637,7 +637,7 @@
+--- scripts/mk_util.py.orig    2018-02-22 23:06:23.490379838 +0000
++++ scripts/mk_util.py
+@@ -637,7 +637,7 @@ def parse_options():
              SLOW_OPTIMIZE = True
          elif not IS_WINDOWS and opt in ('-p', '--prefix'):
              PREFIX = arg
@@ -14,3 +15,14 @@ diff -r 59247c69b92d scripts/mk_util.py
              mk_dir(DESTDIR + PYTHON_PACKAGE_DIR)
              if sys.version >= "3":
                  mk_dir(os.path.join(DESTDIR + PYTHON_PACKAGE_DIR, '__pycache__'))
+@@ -1506,8 +1506,8 @@ class MLComponent(Component):
+                         get_component(Z3_DLL_COMPONENT).dll_name + '$(SO_EXT)',
+                         os.path.join(sub_dir, 'z3ml.cmxa'),
+                         os.path.join(sub_dir, 'META')))
+-                out.write('\t%s remove Z3\n' % (OCAMLFIND))
+-                out.write('\t%s install Z3 %s' % (OCAMLFIND, (os.path.join(sub_dir, 'META'))))
++                out.write('\t%s remove -destdir $(DESTDIR)/ -ldconf ignore Z3\n' % (OCAMLFIND))
++                out.write('\t%s install -destdir $(DESTDIR)/ -ldconf ignore Z3 %s' % (OCAMLFIND, (os.path.join(sub_dir, 'META'))))
+                 for m in modules:
+                     out.write(' %s.cma' % (os.path.join(sub_dir, m)))
+                     out.write(' %s.cmx' % (os.path.join(sub_dir, m)))