Tue Sep 26 17:49:10 2017 UTC ()
verifast: fix build on SunOS

The changes for NetBSD also works on SunOS


(wiedi)
diff -r1.4 -r1.5 pkgsrc/devel/verifast/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/verifast/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/verifast/patches/patch-src_GNUmakefile
cvs diff -r1.4 -r1.5 pkgsrc/devel/verifast/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/verifast/Attic/Makefile 2017/09/18 09:53:19 1.4
+++ pkgsrc/devel/verifast/Attic/Makefile 2017/09/26 17:49:10 1.5
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.4 2017/09/18 09:53:19 maya Exp $ 1# $NetBSD: Makefile,v 1.5 2017/09/26 17:49:10 wiedi Exp $
2 2
3DISTNAME= verifast-17.06 3DISTNAME= verifast-17.06
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=verifast/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=verifast/}
7GITHUB_PROJECT= verifast 7GITHUB_PROJECT= verifast
8GITHUB_TAG= v${PKGVERSION_NOREV} 8GITHUB_TAG= v${PKGVERSION_NOREV}
9 9
10MAINTAINER= ryoon@NetBSD.org 10MAINTAINER= ryoon@NetBSD.org
11HOMEPAGE= https://people.cs.kuleuven.be/~bart.jacobs/verifast/ 11HOMEPAGE= https://people.cs.kuleuven.be/~bart.jacobs/verifast/
12COMMENT= VeriFast code verifier in separation logic 12COMMENT= VeriFast code verifier in separation logic
13LICENSE= mit 13LICENSE= mit
14 14
15USE_TOOLS+= gmake pax pkg-config 15USE_TOOLS+= gmake pax pkg-config
16MAKE_FILE= GNUmakefile 16MAKE_FILE= GNUmakefile
17BUILD_MAKE_FLAGS+= -C src NUMCPU=${MAKE_JOBS} 17BUILD_MAKE_FLAGS+= -C src NUMCPU=${MAKE_JOBS}
cvs diff -r1.2 -r1.3 pkgsrc/devel/verifast/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/verifast/Attic/distinfo 2017/09/09 21:57:46 1.2
+++ pkgsrc/devel/verifast/Attic/distinfo 2017/09/26 17:49:10 1.3
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.2 2017/09/09 21:57:46 dholland Exp $ 1$NetBSD: distinfo,v 1.3 2017/09/26 17:49:10 wiedi Exp $
2 2
3SHA1 (verifast-17.06.tar.gz) = 9c918c6fa88ab11315fe80abfa097dcc8d0f85cd 3SHA1 (verifast-17.06.tar.gz) = 9c918c6fa88ab11315fe80abfa097dcc8d0f85cd
4RMD160 (verifast-17.06.tar.gz) = 8808173823c6697272450ba0eac71cfc4824af54 4RMD160 (verifast-17.06.tar.gz) = 8808173823c6697272450ba0eac71cfc4824af54
5SHA512 (verifast-17.06.tar.gz) = f4ffe75cf5d47e48f565c34b12dd134f6ffd527a12146484f8cf14549b0e5292c8e4b4e077fe1c8ae93c0f045ba8760e42369ddaea2b47fef9f37e0403202193 5SHA512 (verifast-17.06.tar.gz) = f4ffe75cf5d47e48f565c34b12dd134f6ffd527a12146484f8cf14549b0e5292c8e4b4e077fe1c8ae93c0f045ba8760e42369ddaea2b47fef9f37e0403202193
6Size (verifast-17.06.tar.gz) = 1698045 bytes 6Size (verifast-17.06.tar.gz) = 1698045 bytes
7SHA1 (patch-src_GNUmakefile) = ceb2071c030d6120e6c25b497deba75fcf53d8ba 7SHA1 (patch-src_GNUmakefile) = d1ac3b421af71ddabb761e4ae98bd1edb7dda5f9
8SHA1 (patch-src_linux_caml__stopwatch.c) = 5c5587f7af0b99717fa192544c0b1e3f5165c24b 8SHA1 (patch-src_linux_caml__stopwatch.c) = 5c5587f7af0b99717fa192544c0b1e3f5165c24b
cvs diff -r1.1 -r1.2 pkgsrc/devel/verifast/patches/Attic/patch-src_GNUmakefile (expand / switch to unified diff)

--- pkgsrc/devel/verifast/patches/Attic/patch-src_GNUmakefile 2017/07/12 01:54:16 1.1
+++ pkgsrc/devel/verifast/patches/Attic/patch-src_GNUmakefile 2017/09/26 17:49:10 1.2
@@ -1,75 +1,83 @@ @@ -1,75 +1,83 @@
1$NetBSD: patch-src_GNUmakefile,v 1.1 2017/07/12 01:54:16 ryoon Exp $ 1$NetBSD: patch-src_GNUmakefile,v 1.2 2017/09/26 17:49:10 wiedi Exp $
2 2
3* Fix build under NetBSD 3* Fix build under NetBSD and SunOS
4 4
5--- src/GNUmakefile.orig 2017-06-13 16:58:54.000000000 +0000 5--- src/GNUmakefile.orig 2017-06-13 16:58:54.000000000 +0000
6+++ src/GNUmakefile 6+++ src/GNUmakefile
7@@ -41,6 +41,8 @@ else 7@@ -41,6 +41,10 @@ else
8 OS = Darwin 8 OS = Darwin
9 else ifeq ($(shell uname -o), Cygwin) 9 else ifeq ($(shell uname -o), Cygwin)
10 OS = Cygwin 10 OS = Cygwin
11+ else ifeq ($(shell uname -s), NetBSD) 11+ else ifeq ($(shell uname -s), NetBSD)
12+ OS = NetBSD 12+ OS = NetBSD
 13+ else ifeq ($(shell uname -s), SunOS)
 14+ OS = SunOS
13 else 15 else
14 $(error "Could not recognize your platform") 16 $(error "Could not recognize your platform")
15 endif 17 endif
16@@ -50,6 +52,9 @@ endif 18@@ -50,6 +54,12 @@ endif
17 ifndef WITHOUT_LABLGTK 19 ifndef WITHOUT_LABLGTK
18 ifeq ($(OS), Cygwin) 20 ifeq ($(OS), Cygwin)
19 LABLGTK_FLAGS += -I +site-lib/lablgtk2 lablgtk.cmxa 21 LABLGTK_FLAGS += -I +site-lib/lablgtk2 lablgtk.cmxa
20+ else ifeq ($(OS), NetBSD) 22+ else ifeq ($(OS), NetBSD)
21+ LABLGTK_FLAGS_ += -I +site-lib/lablgtk2 23+ LABLGTK_FLAGS_ += -I +site-lib/lablgtk2
22+ LABLGTK_FLAGS += ${LABLGTK_FLAGS_} lablgtk.cmxa 24+ LABLGTK_FLAGS += ${LABLGTK_FLAGS_} lablgtk.cmxa
 25+ else ifeq ($(OS), SunOS)
 26+ LABLGTK_FLAGS_ += -I +site-lib/lablgtk2
 27+ LABLGTK_FLAGS += ${LABLGTK_FLAGS_} lablgtk.cmxa
23 else 28 else
24 LABLGTK_FLAGS_ += -I +../lablgtk2 -I +lablgtk2 29 LABLGTK_FLAGS_ += -I +../lablgtk2 -I +lablgtk2
25 LABLGTK_FLAGS += ${LABLGTK_FLAGS_} lablgtk.cmxa 30 LABLGTK_FLAGS += ${LABLGTK_FLAGS_} lablgtk.cmxa
26@@ -137,11 +142,7 @@ OCAML = ${OCAMLBIN}/ocaml 31@@ -137,11 +147,7 @@ OCAML = ${OCAMLBIN}/ocaml
27 OCAMLC = $(firstword $(wildcard ${OCAMLBIN}/ocamlc.opt ${OCAMLBIN}/ocamlc)) 32 OCAMLC = $(firstword $(wildcard ${OCAMLBIN}/ocamlc.opt ${OCAMLBIN}/ocamlc))
28 OCAMLOPT = $(firstword $(wildcard ${OCAMLBIN}/ocamlopt.opt ${OCAMLBIN}/ocamlopt)) 33 OCAMLOPT = $(firstword $(wildcard ${OCAMLBIN}/ocamlopt.opt ${OCAMLBIN}/ocamlopt))
29 OCAMLDEP = $(firstword $(wildcard ${OCAMLBIN}/ocamldep.opt ${OCAMLBIN}/ocamldep)) 34 OCAMLDEP = $(firstword $(wildcard ${OCAMLBIN}/ocamldep.opt ${OCAMLBIN}/ocamldep))
30-ifeq ($(OS), Cygwin) 35-ifeq ($(OS), Cygwin)
31- CAMLP4O = camlp4o.opt 36- CAMLP4O = camlp4o.opt
32-else 37-else
33- CAMLP4O = $(firstword $(wildcard ${OCAMLBIN}/camlp4o.opt ${OCAMLBIN}/camlp4o)) 38- CAMLP4O = $(firstword $(wildcard ${OCAMLBIN}/camlp4o.opt ${OCAMLBIN}/camlp4o))
34-endif 39-endif
35+CAMLP4O = camlp4o.opt 40+CAMLP4O = camlp4o.opt
36  41
37 # Do we build with "-I ./linux" or "-I ./win": 42 # Do we build with "-I ./linux" or "-I ./win":
38 ifeq ($(OS), Cygwin) 43 ifeq ($(OS), Cygwin)
39@@ -198,6 +199,9 @@ endif 44@@ -198,6 +204,12 @@ endif
40 ifeq ($(OS), Cygwin) 45 ifeq ($(OS), Cygwin)
41 include win/GNUmakefile 46 include win/GNUmakefile
42 endif 47 endif
43+ifeq ($(OS), NetBSD) 48+ifeq ($(OS), NetBSD)
44+ include linux/GNUmakefile 49+ include linux/GNUmakefile
45+endif 50+endif
 51+ifeq ($(OS), SunOS)
 52+ include linux/GNUmakefile
 53+endif
46  54
47 include java_frontend/GNUmakefile 55 include java_frontend/GNUmakefile
48  56
49@@ -378,7 +382,7 @@ clean:: 57@@ -378,7 +390,7 @@ clean::
50 ifndef WITHOUT_LABLGTK 58 ifndef WITHOUT_LABLGTK
51  59
52 clean:: 60 clean::
53- cd linemarks; make clean 61- cd linemarks; make clean
54+ cd linemarks; ${MAKE} clean 62+ cd linemarks; ${MAKE} clean
55  63
56 branchleft_png.ml: branch-left.png 64 branchleft_png.ml: branch-left.png
57 gdk_pixbuf_mlsource branch-left.png > branchleft_png.ml 65 gdk_pixbuf_mlsource branch-left.png > branchleft_png.ml
58@@ -396,7 +400,7 @@ branchright_png.cmx: branchright_png.ml 66@@ -396,7 +408,7 @@ branchright_png.cmx: branchright_png.ml
59 vfide.cmx: branchleft_png.cmx branchright_png.cmx Fonts.cmx vfide.ml $(GTKSOURCEVIEW_DEPS) 67 vfide.cmx: branchleft_png.cmx branchright_png.cmx Fonts.cmx vfide.ml $(GTKSOURCEVIEW_DEPS)
60 @echo " OCAMLOPT " $@ 68 @echo " OCAMLOPT " $@
61 ifndef WITHOUT_GTKSOURCEVIEW 69 ifndef WITHOUT_GTKSOURCEVIEW
62- make -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa 70- make -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa
63+ ${MAKE} -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa 71+ ${MAKE} -C linemarks OCAMLOPT=${OCAMLOPT} OCAMLCFLAGS="${OCAMLCFLAGS}" LABLGTK_FLAGS="$(LABLGTK_FLAGS_)" linemarks.cmxa
64 endif 72 endif
65 $(SET_LDD); $(OCAMLOPT) $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) \ 73 $(SET_LDD); $(OCAMLOPT) $(OCAMLCFLAGS) -thread -c -w p -warn-error FSU -c $(INCLUDES) \
66 -pp ${CAMLP4O} nums.cmxa $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) vfide.ml 74 -pp ${CAMLP4O} nums.cmxa $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) vfide.ml
67@@ -404,7 +408,7 @@ endif 75@@ -404,7 +416,7 @@ endif
68 ../bin/vfide$(DOTEXE): vfide.cmx redux.cmx $(Z3DEPS) plugins2.cmx $(GTKSOURCEVIEW_DEPS) 76 ../bin/vfide$(DOTEXE): vfide.cmx redux.cmx $(Z3DEPS) plugins2.cmx $(GTKSOURCEVIEW_DEPS)
69 @echo " OCAMLOPT " $@ 77 @echo " OCAMLOPT " $@
70 ifndef WITHOUT_GTKSOURCEVIEW 78 ifndef WITHOUT_GTKSOURCEVIEW
71- cd linemarks; make linemarks.cmxa 79- cd linemarks; make linemarks.cmxa
72+ cd linemarks; ${MAKE} linemarks.cmxa 80+ cd linemarks; ${MAKE} linemarks.cmxa
73 endif 81 endif
74 $(SET_LDD); ${OCAMLOPT} $(OCAMLCFLAGS) -warn-error F -pp ${CAMLP4O} -o ../bin/vfide$(DOTEXE) \ 82 $(SET_LDD); ${OCAMLOPT} $(OCAMLCFLAGS) -warn-error F -pp ${CAMLP4O} -o ../bin/vfide$(DOTEXE) \
75 $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) unix.cmxa \ 83 $(LABLGTK_FLAGS) $(GTKSOURCEVIEW_LFLAGS) unix.cmxa \