cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix findlib to correctly detect posix threading instead of vm threads for

Browse Source 
ocaml apps compiled using it.

Issue was that the configure script which tried threads gets confused by
the spurious OpenBSD linker warnings about sprintf and falls back to VM
threads.

Bump PKGNAME, and trim an unneeded line from PLIST while here.

Reported by Adam Montague <amontague@siriushosting.com> and
Ivan M Makarenko <I.Makarenko@zsttk.ru>.
This commit is contained in:
avsm 2006-12-26 23:09:32 +00:00
parent 45a6e1fb7c
commit de30324362
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/findlib/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2006/12/26 22:39:31 avsm Exp $
# $OpenBSD: Makefile,v 1.10 2006/12/26 23:09:32 avsm Exp $
COMMENT= "Objective Caml package manager"
CATEGORIES= sysutils
DISTNAME= findlib-1.1.2pl1
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
MASTER_SITES= http://www.ocaml-programming.de/packages/
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>

31
sysutils/findlib/patches/patch-configure Normal file
View File

@ -0,0 +1,31 @@
$OpenBSD: patch-configure,v 1.1 2006/12/26 23:09:32 avsm Exp $
--- configure.orig Tue Dec 26 21:59:27 2006
+++ configure Tue Dec 26 22:00:00 2006
@@ -264,25 +264,8 @@ fi
######################################################################
# Test the threading model
-echo "Testing threading model..."
-
-if ocamlc -vmthread >/dev/null 2>/dev/null; then
- :
-else
- echo "The -vmthread switch is not supported: Your ocaml version is too old!"
- exit 1
-fi
-
-rm -f itest-aux/simple
-ocamlc -w a -custom -thread -o itest-aux/simple unix.cma threads.cma itest-aux/simple_threads.ml \
- >itest-aux/err.out 2>&1
-output=`cat itest-aux/err.out`
-
-if [ -z "$output" ]; then
- ocaml_threads="posix"
-else
- ocaml_threads="vm"
-fi
+echo "Setting threading model to posix..."
+ocaml_threads="posix"
######################################################################
# Does this version of OCaml support autolinking?

3
sysutils/findlib/pkg/PLIST
View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2006/05/29 03:46:29 avsm Exp $
@comment $OpenBSD: PLIST,v 1.5 2006/12/26 23:09:32 avsm Exp $
bin/ocamlfind
bin/safe_camlp4
lib/ocaml/
lib/ocaml/site-lib/
lib/ocaml/site-lib/bigarray/
lib/ocaml/site-lib/bigarray/META