CVS commit: pkgsrc/devel/ocaml-lwt

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Aug 17 19:20:30 UTC 2022

Modified Files:
        pkgsrc/devel/ocaml-lwt: Makefile.common

Log Message:
ocaml-lwt: avoid clash with system headers


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/ocaml-lwt/Makefile.common

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

Modified files:

Index: pkgsrc/devel/ocaml-lwt/Makefile.common
diff -u pkgsrc/devel/ocaml-lwt/Makefile.common:1.10 pkgsrc/devel/ocaml-lwt/Makefile.common:1.11
--- pkgsrc/devel/ocaml-lwt/Makefile.common:1.10 Mon May  2 14:02:09 2022
+++ pkgsrc/devel/ocaml-lwt/Makefile.common      Wed Aug 17 19:20:30 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2022/05/02 14:02:09 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.11 2022/08/17 19:20:30 tnn Exp $
 
 # used by devel/ocaml-lwt_ppx/Makefile
 # used by devel/ocaml-lwt_react/Makefile
@@ -16,3 +16,11 @@ OCAML_USE_DUNE=      yes
 
 DISTINFO_FILE= ${PKGDIR}/../../devel/ocaml-lwt/distinfo
 PATCHDIR=      ${PKGDIR}/../../devel/ocaml-lwt/patches
+
+# SunOS <sys/time.h> has #define NANOSEC 1000000000LL, don't clash
+SUBST_CLASSES+=                nanosec
+SUBST_MESSAGE.nanosec= renaming NANOSEC macro
+SUBST_STAGE.nanosec=   pre-configure
+SUBST_FILES.nanosec=   src/unix/lwt_config.h
+SUBST_FILES.nanosec+=  src/unix/unix_c/unix_stat_job_utils.c
+SUBST_SED.nanosec+=    -e 's,NANOSEC(,LWT_&,g'