pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/ocaml-lwt ocaml-lwt: avoid clash with system hea...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/65dd08333277
branches:  trunk
changeset: 383331:65dd08333277
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Aug 17 19:20:30 2022 +0000

description:
ocaml-lwt: avoid clash with system headers

diffstat:

 devel/ocaml-lwt/Makefile.common |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r b47bacf03c54 -r 65dd08333277 devel/ocaml-lwt/Makefile.common
--- a/devel/ocaml-lwt/Makefile.common   Wed Aug 17 18:53:40 2022 +0000
+++ b/devel/ocaml-lwt/Makefile.common   Wed Aug 17 19:20:30 2022 +0000
@@ -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 @@
 
 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'



Home | Main Index | Thread Index | Old Index