CVS commit: pkgsrc/devel/verifast

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sat Sep  9 21:57:46 UTC 2017

Modified Files:
        pkgsrc/devel/verifast: Makefile distinfo
Added Files:
        pkgsrc/devel/verifast/patches: patch-src_linux_caml__stopwatch.c

Log Message:
Don't randomly use the implementation namespace. Fixes clang build.

Also, pass MAKE_JOBS as the number of CPUs to use when testing, as
otherwise it gets 0 and apparently interprets that as "infinitely
many".

XXX: The test suite should not really be run as part of the build.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/verifast/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/verifast/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/verifast/patches/patch-src_linux_caml__stopwatch.c

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

Modified files:

Index: pkgsrc/devel/verifast/Makefile
diff -u pkgsrc/devel/verifast/Makefile:1.2 pkgsrc/devel/verifast/Makefile:1.3
--- pkgsrc/devel/verifast/Makefile:1.2  Fri Sep  8 09:51:23 2017
+++ pkgsrc/devel/verifast/Makefile      Sat Sep  9 21:57:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/09/08 09:51:23 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/09 21:57:46 dholland Exp $
 
 DISTNAME=              verifast-17.06
 PKGREVISION=           1
@@ -14,7 +14,7 @@ LICENSE=              mit
 
 USE_TOOLS+=            gmake pax pkg-config
 MAKE_FILE=             GNUmakefile
-BUILD_MAKE_FLAGS+=     -C src
+BUILD_MAKE_FLAGS+=     -C src NUMCPU=${MAKE_JOBS}
 
 BUILD_DEPENDS+=                vala-[0-9]*:../../lang/vala
 BUILD_DEPENDS+=                camlp4-[0-9]*:../../lang/camlp4

Index: pkgsrc/devel/verifast/distinfo
diff -u pkgsrc/devel/verifast/distinfo:1.1 pkgsrc/devel/verifast/distinfo:1.2
--- pkgsrc/devel/verifast/distinfo:1.1  Wed Jul 12 01:54:16 2017
+++ pkgsrc/devel/verifast/distinfo      Sat Sep  9 21:57:46 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1 2017/07/12 01:54:16 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2017/09/09 21:57:46 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) = ceb2071c030d6120e6c25b497deba75fcf53d8ba
+SHA1 (patch-src_linux_caml__stopwatch.c) = 5c5587f7af0b99717fa192544c0b1e3f5165c24b

Added files:

Index: pkgsrc/devel/verifast/patches/patch-src_linux_caml__stopwatch.c
diff -u /dev/null pkgsrc/devel/verifast/patches/patch-src_linux_caml__stopwatch.c:1.1
--- /dev/null   Sat Sep  9 21:57:46 2017
+++ pkgsrc/devel/verifast/patches/patch-src_linux_caml__stopwatch.c     Sat Sep  9 21:57:46 2017
@@ -0,0 +1,58 @@
+$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;