Upstream patch to fix detection of "num" package.

This commit is contained in:
Richard W.M. Jones 2017-11-07 22:00:52 +00:00
parent 711fbdce59
commit 92d2cdf5eb
2 changed files with 51 additions and 0 deletions

View File

@ -0,0 +1,47 @@
diff --git a/configure b/configure
index 6a4a558..3f99074 100755
--- a/configure
+++ b/configure
@@ -514,7 +514,10 @@ fi
# dbm?
-if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
+if [ -f "${ocaml_sitelib}/dbm/META" ]; then
+ echo "dbm: package already present"
+ ldbm=""
+elif [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
echo "dbm: found"
ldbm="dbm"
else
@@ -524,8 +527,12 @@ fi
# num?
-if [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
- echo "num: found"
+if [ -f "${ocaml_sitelib}/num/META" ]; then
+ echo "num: package already present"
+ lnum=""
+ numtop=""
+elif [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
+ echo "num: found but not as package"
lnum="num num-top"
numtop="num-top"
else
diff --git a/doc/README.xml b/doc/README.xml
index 248483e..0b2b3b5 100644
--- a/doc/README.xml
+++ b/doc/README.xml
@@ -110,6 +110,11 @@ configuration files, and library routines in detail.</p>
<ul>
<li>
+ <p><em>git version:</em> Fix reinstallation of "num" for OCaml-4.06.
+ </p>
+ </li>
+
+ <li>
<p><em>1.7.3:</em> Fix regarding num-top: this library is now also
optional, as num.</p>
</li>

View File

@ -10,6 +10,9 @@ Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz
# Use ocamlopt -g patch to include debug information.
Patch1: findlib-1.4-add-debug.patch
# Upstream patch to fix detection of "num" package.
Patch2: findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch
BuildRequires: ocaml >= 4.02.0
BuildRequires: ocaml-camlp4-devel
BuildRequires: ocaml-labltk-devel
@ -40,6 +43,7 @@ developing applications that use %{name}.
%prep
%setup -q -n findlib-%{version}
%patch1 -p2
%patch2 -p1
%build