[pkgsrc/trunk]: pkgsrc/devel/verifast Update to 18.02 to fix build with ocaml...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/devel/verifast Update to 18.02 to fix build with ocaml...
From: dholland <dholland%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 08:56:18 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c8cc7a29cecc
branches:  trunk
changeset: 377054:c8cc7a29cecc
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Tue Mar 13 05:45:25 2018 +0000

description:
Update to 18.02 to fix build with ocaml 4.06.

pkgsrc changes:
  - depends on z3; theoretically optional but build fails without it
  - needs ocaml-findlib now
  - use ocaml.mk

No upstream changelog that I can find besides the github history.

diffstat:

 devel/verifast/Makefile                                  |  23 ++-
 devel/verifast/distinfo                                  |  13 +-
 devel/verifast/files/GNUmakefile.settings                |  16 ++
 devel/verifast/patches/patch-src_GNUmakefile             |  98 ++++++++++-----
 devel/verifast/patches/patch-src_linux_caml__stopwatch.c |  58 ---------
 5 files changed, 106 insertions(+), 102 deletions(-)

diffs (298 lines):

diff -r 23c5af662017 -r c8cc7a29cecc devel/verifast/Makefile
--- a/devel/verifast/Makefile   Tue Mar 13 03:01:15 2018 +0000
+++ b/devel/verifast/Makefile   Tue Mar 13 05:45:25 2018 +0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2018/03/12 11:16:21 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/13 05:45:25 dholland Exp $
 
-DISTNAME=              verifast-17.06
-PKGREVISION=           8
+DISTNAME=              verifast-18.02
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=verifast/}
 GITHUB_PROJECT=                verifast
-GITHUB_TAG=            v${PKGVERSION_NOREV}
+GITHUB_TAG=            ${PKGVERSION_NOREV}
 
 MAINTAINER=            ryoon%NetBSD.org@localhost
 HOMEPAGE=              https://people.cs.kuleuven.be/~bart.jacobs/verifast/
@@ -21,6 +20,16 @@
 
 VF_DIR=                        share/verifast
 INSTALLATION_DIRS=     ${VF_DIR} bin
+OCAML_USE_FINDLIB=     yes
+BUILD_TARGET=          depend all
+MAKE_JOBS_SAFE=                no
+
+do-configure:
+       ${CP} ${FILESDIR}/GNUmakefile.settings ${WRKSRC}/
+SUBST_CLASSES+=                conf
+SUBST_FILES.conf=      GNUmakefile.settings
+SUBST_VARS.conf=       PREFIX OCAML_SITELIBDIR PKGVERSION_NOREV
+SUBST_STAGE.conf=      post-configure
 
 do-install:
        cd ${WRKSRC}/bin && ${FIND} . -type f -print | \
@@ -30,8 +39,10 @@
                >> ${DESTDIR}${PREFIX}/bin/vfide
        ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/vfide
 
+.include "../../mk/ocaml.mk"
+
 .include "../../lang/camlp4/buildlink3.mk"
-BUILDLINK_DEPMETHOD.ocaml=     full
-.include "../../lang/ocaml/buildlink3.mk"
+.include "../../math/ocaml-num/buildlink3.mk"
+.include "../../math/z3/buildlink3.mk"
 .include "../../x11/ocaml-lablgtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 23c5af662017 -r c8cc7a29cecc devel/verifast/distinfo
--- a/devel/verifast/distinfo   Tue Mar 13 03:01:15 2018 +0000
+++ b/devel/verifast/distinfo   Tue Mar 13 05:45:25 2018 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2017/09/26 17:49:10 wiedi Exp $
+$NetBSD: distinfo,v 1.4 2018/03/13 05:45:25 dholland Exp $
 
-SHA1 (verifast-17.06.tar.gz) = 9c918c6fa88ab11315fe80abfa097dcc8d0f85cd
-RMD160 (verifast-17.06.tar.gz) = 8808173823c6697272450ba0eac71cfc4824af54
-SHA512 (verifast-17.06.tar.gz) = f4ffe75cf5d47e48f565c34b12dd134f6ffd527a12146484f8cf14549b0e5292c8e4b4e077fe1c8ae93c0f045ba8760e42369ddaea2b47fef9f37e0403202193
-Size (verifast-17.06.tar.gz) = 1698045 bytes
-SHA1 (patch-src_GNUmakefile) = d1ac3b421af71ddabb761e4ae98bd1edb7dda5f9
-SHA1 (patch-src_linux_caml__stopwatch.c) = 5c5587f7af0b99717fa192544c0b1e3f5165c24b
+SHA1 (verifast-18.02.tar.gz) = 6100ea410e5f7e1c5ceacc16263137f60ebe7ced
+RMD160 (verifast-18.02.tar.gz) = 28d98b0033a9026599db6098bde6871c47d99ded
+SHA512 (verifast-18.02.tar.gz) = 5f1c6203d9db4556a00402e56b6699cb00e75c388f2de6f957558cf7611ddabddccfc4ae1235a1cd8fabc4ec5673df6588e475328ed562799f1fa687ad5c38aa
+Size (verifast-18.02.tar.gz) = 1732020 bytes
+SHA1 (patch-src_GNUmakefile) = 880a8369c92eaf3162e62b104ee2a3755f3d6055
diff -r 23c5af662017 -r c8cc7a29cecc devel/verifast/files/GNUmakefile.settings
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/verifast/files/GNUmakefile.settings Tue Mar 13 05:45:25 2018 +0000
@@ -0,0 +1,16 @@
+# Path to Z3 (optional)
+# Note: if you actually set this, the build explodes.
+#Z3 = @PREFIX@/bin/z3
+# but it does need this:
+Z3_DLL_DIR = @PREFIX@/lib
+
+# lablgtk2 installation directories
+LABLGTK2 = @PREFIX@/@OCAML_SITELIBDIR@/lablgtk2/
+LABLLIBS = @PREFIX@/@OCAML_SITELIBDIR@/lablgtk2/
+
+# stick in the package version to work around its own method
+# (which only works for git clones)
+VFVERSION = @PKGVERSION_NOREV@
+
+# also without this the super-fragile build system is undebuggable
+VERBOSE=yes
diff -r 23c5af662017 -r c8cc7a29cecc devel/verifast/patches/patch-src_GNUmakefile
--- a/devel/verifast/patches/patch-src_GNUmakefile      Tue Mar 13 03:01:15 2018 +0000
+++ b/devel/verifast/patches/patch-src_GNUmakefile      Tue Mar 13 05:45:25 2018 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_GNUmakefile,v 1.2 2017/09/26 17:49:10 wiedi Exp $
+$NetBSD: patch-src_GNUmakefile,v 1.3 2018/03/13 05:45:25 dholland Exp $
 
 * Fix build under NetBSD and SunOS
 
---- src/GNUmakefile.orig       2017-06-13 16:58:54.000000000 +0000
+--- src/GNUmakefile.orig       2018-03-05 10:56:03.000000000 +0000
 +++ src/GNUmakefile
-@@ -41,6 +41,10 @@ else
+@@ -42,17 +42,26 @@ else
            OS = Darwin
    else ifeq ($(shell uname -o), Cygwin)
-           OS = Cygwin
+           OS = Windows_NT
 +  else ifeq ($(shell uname -s), NetBSD)
 +          OS = NetBSD
 +  else ifeq ($(shell uname -s), SunOS)
@@ -15,24 +15,27 @@
    else
            $(error "Could not recognize your platform")
    endif
-@@ -50,6 +54,12 @@ endif
- ifndef WITHOUT_LABLGTK
-   ifeq ($(OS), Cygwin)
-     LABLGTK_FLAGS += -I +site-lib/lablgtk2 lablgtk.cmxa
-+  else ifeq ($(OS), NetBSD)
-+    LABLGTK_FLAGS_ += -I +site-lib/lablgtk2
-+    LABLGTK_FLAGS += ${LABLGTK_FLAGS_} lablgtk.cmxa
-+  else ifeq ($(OS), SunOS)
-+    LABLGTK_FLAGS_ += -I +site-lib/lablgtk2
-+    LABLGTK_FLAGS += ${LABLGTK_FLAGS_} lablgtk.cmxa
-   else
-     LABLGTK_FLAGS_ += -I +../lablgtk2 -I +lablgtk2
-     LABLGTK_FLAGS  += ${LABLGTK_FLAGS_} lablgtk.cmxa
-@@ -137,11 +147,7 @@ OCAML        = ${OCAMLBIN}/ocaml
+ endif
+ 
++# what is the point of this extra copy?
+ ifeq ($(OS), Linux)
+   PLATFORM = Linux
+ else ifeq ($(OS), Darwin)
+   PLATFORM = MacOS
+ else ifeq ($(OS), Windows_NT)
+   PLATFORM = Windows
++else ifeq ($(OS), NetBSD)
++  PLATFORM = NetBSD
++else ifeq ($(OS), SunOS)
++  PLATFORM = SunOS
+ endif
+ 
+ # Lablgtk configuration
+@@ -180,23 +189,21 @@ OCAML        = ${OCAMLBIN}/ocaml
  OCAMLC       = $(firstword $(wildcard ${OCAMLBIN}/ocamlc.opt ${OCAMLBIN}/ocamlc))
  OCAMLOPT     = $(firstword $(wildcard ${OCAMLBIN}/ocamlopt.opt ${OCAMLBIN}/ocamlopt))
  OCAMLDEP     = $(firstword $(wildcard ${OCAMLBIN}/ocamldep.opt ${OCAMLBIN}/ocamldep))
--ifeq ($(OS), Cygwin)
+-ifeq ($(OS), Windows_NT)
 -  CAMLP4O    = camlp4o.opt
 -else
 -  CAMLP4O      = $(firstword $(wildcard ${OCAMLBIN}/camlp4o.opt ${OCAMLBIN}/camlp4o))
@@ -40,9 +43,24 @@
 +CAMLP4O    = camlp4o.opt
  
  # Do we build with "-I ./linux" or "-I ./win":
- ifeq ($(OS), Cygwin)
-@@ -198,6 +204,12 @@ endif
- ifeq ($(OS), Cygwin)
+ ifeq ($(OS), Windows_NT)
+   INCLUDE_OS_DIR = win
+ else
+-# Also for mac.
++# Also for mac, bsd, etc.
+   INCLUDE_OS_DIR = linux
+ endif
+ 
+ # Number of CPUs
+ ifeq ($(OS), Darwin)
+   NUMCPU ?= $(shell sysctl -n hw.ncpu)
++else ifeq ($(OS), NetBSD)
++  NUMCPU ?= $(shell sysctl -n hw.ncpu)
+ else
+ # Works on Linux and Cygwin (Cygwin has no /sys).
+   NUMCPU ?= $(shell cat /proc/cpuinfo | grep 'processor' | wc -l)
+@@ -244,6 +251,12 @@ endif
+ ifeq ($(OS), Windows_NT)
    include win/GNUmakefile
  endif
 +ifeq ($(OS), NetBSD)
@@ -54,30 +72,48 @@
  
  include java_frontend/GNUmakefile
  
-@@ -378,7 +390,7 @@ clean::
+@@ -304,7 +317,7 @@ clean::
+ 
+ %.cmx: %.ml $(INCLUDE_OS_DIR)/Perf.cmxa
+       @echo "  OCAMLOPT " $@
+-      ${OCAMLOPT} $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) -pp ${CAMLP4O} nums.cmxa  $*.ml
++      ${OCAMLOPT} $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) -pp ${CAMLP4O} $*.ml
+ clean::
+       rm -f *.cmx
+       rm -f *.o
+@@ -340,7 +353,7 @@ clean::
+       rm -f vfversion.ml
+ AUTOGENERATE_TARGETS += vfversion_autogen
+ 
+-VFCONFIG_CONTENT=let z3_present = $(Z3PRESENT);; let z3v4dot5_present = $(Z3V4DOT5PRESENT);; type platform = Windows | MacOS | Linux;; let platform = $(PLATFORM)
++VFCONFIG_CONTENT=let z3_present = $(Z3PRESENT);; let z3v4dot5_present = $(Z3V4DOT5PRESENT);; type platform = Windows | MacOS | Linux | NetBSD | SunOS;; let platform = $(PLATFORM)
+ vfconfig_autogen:
+       if [ ! -e vfconfig.ml ] || [ "$$(cat vfconfig.ml)" != "$(VFCONFIG_CONTENT)" ]; then \
+         echo "$(VFCONFIG_CONTENT)" > vfconfig.ml ;\
+@@ -389,7 +402,7 @@ clean::
  ifndef WITHOUT_LABLGTK
  
  clean::
 -      cd linemarks; make clean
-+      cd linemarks; ${MAKE} clean
++      cd linemarks; $(MAKE) clean
  
  branchleft_png.ml: branch-left.png
        gdk_pixbuf_mlsource branch-left.png > branchleft_png.ml
-@@ -396,7 +408,7 @@ branchright_png.cmx: branchright_png.ml
- vfide.cmx: branchleft_png.cmx branchright_png.cmx Fonts.cmx vfide.ml $(GTKSOURCEVIEW_DEPS)
+@@ -407,7 +420,7 @@ branchright_png.cmx: branchright_png.ml
+ vfide.cmx: branchleft_png.cmx branchright_png.cmx vfide.ml $(GTKSOURCEVIEW_DEPS)
        @echo "  OCAMLOPT " $@
  ifndef WITHOUT_GTKSOURCEVIEW
 -      make -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa
-+      ${MAKE} -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa
++      $(MAKE) -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa
  endif
        $(SET_LDD); $(OCAMLOPT) $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) \
        -pp ${CAMLP4O} nums.cmxa $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) vfide.ml
-@@ -404,7 +416,7 @@ endif
- ../bin/vfide$(DOTEXE): vfide.cmx redux.cmx $(Z3DEPS) plugins2.cmx $(GTKSOURCEVIEW_DEPS)
+@@ -423,7 +436,7 @@ endif
+ ../bin/vfide$(DOTEXE): vfide.cmx $(VERIFAST_PLUGINS:%=verifastPlugin%.cmx) $(Z3DEPS) $(GTKSOURCEVIEW_DEPS) 
        @echo "  OCAMLOPT " $@
  ifndef WITHOUT_GTKSOURCEVIEW
 -      cd linemarks; make linemarks.cmxa
-+      cd linemarks; ${MAKE} linemarks.cmxa
++      cd linemarks; $(MAKE) linemarks.cmxa
  endif
-       $(SET_LDD); ${OCAMLOPT} $(OCAMLCFLAGS) -warn-error F -pp ${CAMLP4O} -o ../bin/vfide$(DOTEXE)    \
+       $(SET_LDD); ${OCAMLOPT} $(OCAMLOPT_LINKFLAGS) $(OCAMLCFLAGS) -warn-error F -pp ${CAMLP4O} -o ../bin/vfide$(DOTEXE)      \
          $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) unix.cmxa \
diff -r 23c5af662017 -r c8cc7a29cecc devel/verifast/patches/patch-src_linux_caml__stopwatch.c
--- a/devel/verifast/patches/patch-src_linux_caml__stopwatch.c  Tue Mar 13 03:01:15 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-$NetBSD: patch-src_linux_caml__stopwatch.c,v 1.1 2017/09/09 21:57:46 dholland Exp $
-
-Don't intrude on the implementation namespace. It breaks the clang build.
-
---- src/linux/caml_stopwatch.c~        2017-06-13 16:58:54.000000000 +0000
-+++ src/linux/caml_stopwatch.c
-@@ -10,7 +10,7 @@ value caml_stopwatch_getpid() {
- 
- #if defined(__i386__)
- 
--static __inline__ unsigned long long __rdtsc(void)
-+static __inline__ unsigned long long do_rdtsc(void)
- {
-     unsigned long long int x;
-     __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
-@@ -19,7 +19,7 @@ static __inline__ unsigned long long __r
- 
- #elif defined(__x86_64__)
- 
--static __inline__ unsigned long long __rdtsc(void)
-+static __inline__ unsigned long long do_rdtsc(void)
- {
-     unsigned hi, lo;
-     __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
-@@ -28,7 +28,7 @@ static __inline__ unsigned long long __r
- 
- #else
- 
--static __inline__ unsigned long long __rdtsc(void)
-+static __inline__ unsigned long long do_rdtsc(void)
- {
-     return 0;
- }
-@@ -47,7 +47,7 @@ value caml_lock_process_to_processor_1()
- }
- 
- value caml_stopwatch_processor_ticks() {
--    return copy_int64(__rdtsc());
-+    return copy_int64(do_rdtsc());
- }
- 
- struct stopwatch {
-@@ -66,13 +66,13 @@ value caml_stopwatch_create() {
- 
- value caml_stopwatch_start(value stopwatch) {
-     struct stopwatch *s = (void *)stopwatch;
--    s->startTimestamp = __rdtsc();
-+    s->startTimestamp = do_rdtsc();
-     return Val_unit;
- }
- 
- value caml_stopwatch_stop(value stopwatch) {
-     struct stopwatch *s = (void *)stopwatch;
--    unsigned long long tsc = __rdtsc();
-+    unsigned long long tsc = do_rdtsc();
-     s->counter += tsc - s->startTimestamp;
-     s->startTimestamp = NO_TIMESTAMP;
-     return Val_unit;
Prev by Date: [pkgsrc/trunk]: pkgsrc fake up xorgproto support for native xsrc. it has som...
Next by Date: [pkgsrc/trunk]: pkgsrc/www/py-django-cms Update to 3.5.1
Previous by Thread: [pkgsrc/trunk]: pkgsrc fake up xorgproto support for native xsrc. it has som...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/py-django-cms Update to 3.5.1
Indexes:
Home | Main Index | Thread Index | Old Index