The following commit has been merged in the master branch: commit 650c06243ab7c52704ff54411a0f98c005c211ac Author: Stephane Glondu <st...@glondu.net> Date: Sun Jul 24 15:57:20 2011 +0200
Try also ocamlc for POSIX threads diff --git a/debian/patches/Force-major-version-for-apache-to-2.patch b/debian/patches/Force-major-version-for-apache-to-2.patch index f6ea5f6..4441284 100644 --- a/debian/patches/Force-major-version-for-apache-to-2.patch +++ b/debian/patches/Force-major-version-for-apache-to-2.patch @@ -12,10 +12,10 @@ Signed-off-by: Stefano Zacchiroli <z...@upsilon.cc> 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 836ca6f..137bbd4 100755 +index 5ecdf64..965edfd 100755 --- a/configure +++ b/configure -@@ -714,8 +714,8 @@ if [ $enable_apache -gt 0 ]; then +@@ -776,8 +776,8 @@ if [ $enable_apache -gt 0 ]; then apache=`get_path apache` fi diff --git a/debian/patches/Try-also-ocamlc-for-POSIX-threads.patch b/debian/patches/Try-also-ocamlc-for-POSIX-threads.patch new file mode 100644 index 0000000..9c5c793 --- /dev/null +++ b/debian/patches/Try-also-ocamlc-for-POSIX-threads.patch @@ -0,0 +1,25 @@ +From: Stephane Glondu <st...@glondu.net> +Date: Sun, 24 Jul 2011 15:53:50 +0200 +Subject: Try also ocamlc for POSIX threads + +The original test was always forcing -vmthread on bytecode +architectures... +--- + configure | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 965edfd..2e8e16f 100755 +--- a/configure ++++ b/configure +@@ -405,7 +405,8 @@ mkdir -p tmp + cat <<_EOF_ >tmp/t.ml + let _ = Mutex.create();; + _EOF_ +-if ocamlopt -thread -o tmp/t${exec_suffix} ${OCAMLOPTFLAGS} unix.cmxa threads.cmxa tmp/t.ml 2>/dev/null; then ++if ocamlopt -thread -o tmp/t${exec_suffix} ${OCAMLOPTFLAGS} unix.cmxa threads.cmxa tmp/t.ml 2>/dev/null || ++ ocamlc -thread -o tmp/t${exec_suffix} unix.cma threads.cma tmp/t.ml 2>/dev/null; then + if tmp/t${exec_suffix} 2>/dev/null; then + mt_type=posix + mt_switch="-thread" +-- diff --git a/debian/patches/series b/debian/patches/series index 8b05083..53b2e37 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ Create-installation-directories.patch Added-missing-shebang-lines-in-example-shell-scripts.patch Do-not-install-apache.info-file.patch Force-major-version-for-apache-to-2.patch +Try-also-ocamlc-for-POSIX-threads.patch -- ocamlnet packaging _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits