pkgsrc-WIP-changes archive

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

Fixed errors in ocaml pointed out by pkglint



Module Name:	pkgsrc-wip
Committed By:	Jaap Boender <jaapb%NetBSD.org@localhost>
Pushed By:	jaapb
Date:		Mon Mar 8 21:26:59 2021 +0100
Changeset:	f387b92e12132a406506fb9245853992489eb879

Modified Files:
	ocaml/PLIST
	ocaml/patches/patch-Makefile
	ocaml/patches/patch-Makefile.build_config.in
	ocaml/patches/patch-configure
	ocaml/patches/patch-lex_Makefile
	ocaml/patches/patch-otherlibs_Makefile.otherlibs.common

Log Message:
Fixed errors in ocaml pointed out by pkglint

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f387b92e12132a406506fb9245853992489eb879

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

diffstat:
 ocaml/PLIST                                             | 12 ++++--------
 ocaml/patches/patch-Makefile                            |  3 +++
 ocaml/patches/patch-Makefile.build_config.in            |  2 ++
 ocaml/patches/patch-configure                           |  7 +++++++
 ocaml/patches/patch-lex_Makefile                        |  2 ++
 ocaml/patches/patch-otherlibs_Makefile.otherlibs.common |  2 ++
 6 files changed, 20 insertions(+), 8 deletions(-)

diffs:
diff --git a/ocaml/PLIST b/ocaml/PLIST
index a7074d4a92..24a42185bd 100644
--- a/ocaml/PLIST
+++ b/ocaml/PLIST
@@ -1477,10 +1477,6 @@ ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_platform_intf.cmx
 ${PLIST.ocaml-nat}${PLIST.ocaml-opt}lib/ocaml/dynlink_types.cmx
 lib/ocaml/either.ml
 lib/ocaml/either.mli
-lib/ocaml/stdlib__ephemeron.cmi
-lib/ocaml/stdlib__ephemeron.cmt
-lib/ocaml/stdlib__ephemeron.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__ephemeron.cmx
 lib/ocaml/ephemeron.ml
 lib/ocaml/ephemeron.mli
 lib/ocaml/eventlog_metadata
@@ -1689,10 +1685,6 @@ ${PLIST.ocaml-opt}lib/ocaml/stdlib.cmx
 ${PLIST.ocaml-opt}lib/ocaml/stdlib.cmxa
 lib/ocaml/stdlib.ml
 lib/ocaml/stdlib.mli
-lib/ocaml/stdlib__atomic.cmi
-lib/ocaml/stdlib__atomic.cmt
-lib/ocaml/stdlib__atomic.cmti
-${PLIST.ocaml-opt}lib/ocaml/stdlib__atomic.cmx
 lib/ocaml/stdlib__arg.cmi
 lib/ocaml/stdlib__arg.cmt
 lib/ocaml/stdlib__arg.cmti
@@ -1705,6 +1697,10 @@ lib/ocaml/stdlib__arrayLabels.cmi
 lib/ocaml/stdlib__arrayLabels.cmt
 lib/ocaml/stdlib__arrayLabels.cmti
 ${PLIST.ocaml-opt}lib/ocaml/stdlib__arrayLabels.cmx
+lib/ocaml/stdlib__atomic.cmi
+lib/ocaml/stdlib__atomic.cmt
+lib/ocaml/stdlib__atomic.cmti
+${PLIST.ocaml-opt}lib/ocaml/stdlib__atomic.cmx
 lib/ocaml/stdlib__bigarray.cmi
 lib/ocaml/stdlib__bigarray.cmt
 lib/ocaml/stdlib__bigarray.cmti
diff --git a/ocaml/patches/patch-Makefile b/ocaml/patches/patch-Makefile
index f885f4e89f..6ec32f6dc8 100644
--- a/ocaml/patches/patch-Makefile
+++ b/ocaml/patches/patch-Makefile
@@ -1,5 +1,8 @@
 $NetBSD$
 
+Use BSD_INSTALL_* instead of mkdir
+Honor LDFLAGS
+
 --- Makefile.orig	2021-02-24 13:49:29.000000000 +0000
 +++ Makefile
 @@ -45,7 +45,7 @@ INCLUDES=-I utils -I parsing -I typing -
diff --git a/ocaml/patches/patch-Makefile.build_config.in b/ocaml/patches/patch-Makefile.build_config.in
index dbd464069c..11888bc071 100644
--- a/ocaml/patches/patch-Makefile.build_config.in
+++ b/ocaml/patches/patch-Makefile.build_config.in
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Use BSD_INSTALL_*
+
 --- Makefile.build_config.in.orig	2021-02-24 13:49:29.000000000 +0000
 +++ Makefile.build_config.in
 @@ -20,9 +20,9 @@
diff --git a/ocaml/patches/patch-configure b/ocaml/patches/patch-configure
index c29de6cbe0..9bddab33f5 100644
--- a/ocaml/patches/patch-configure
+++ b/ocaml/patches/patch-configure
@@ -1,5 +1,12 @@
 $NetBSD$
 
+All kinds of OS-specific changes to configure
+Honor LDFLAGS.
+
+Add SunOS -lnsl -lsocket
+Recognise SunOS/amd64 as amd64
+Recognise SunOS as having shared libraries
+
 --- configure.orig	2021-02-24 13:49:29.000000000 +0000
 +++ configure
 @@ -13639,7 +13639,7 @@ sharedlib_cflags=''
diff --git a/ocaml/patches/patch-lex_Makefile b/ocaml/patches/patch-lex_Makefile
index aa19ba2744..d4a5f1c384 100644
--- a/ocaml/patches/patch-lex_Makefile
+++ b/ocaml/patches/patch-lex_Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- lex/Makefile.orig	2021-02-24 13:49:29.000000000 +0000
 +++ lex/Makefile
 @@ -26,7 +26,7 @@ CAMLC = $(BOOT_OCAMLC) -strict-sequence 
diff --git a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
index ca84d61662..0f05decfbc 100644
--- a/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
+++ b/ocaml/patches/patch-otherlibs_Makefile.otherlibs.common
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Honor LDFLAGS.
+
 --- otherlibs/Makefile.otherlibs.common.orig	2021-02-24 13:49:29.000000000 +0000
 +++ otherlibs/Makefile.otherlibs.common
 @@ -50,7 +50,7 @@ EXTRACFLAGS ?=


Home | Main Index | Thread Index | Old Index