[Pkg-ocaml-maint-commits] [lwt] 01/02: Properly fix installation on bytecode architectures (Closes: #878236)
Stéphane Glondu
glondu at moszumanska.debian.org
Fri Oct 13 13:17:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository lwt.
commit 506f321ca0d52030ec522ddd71c44ed4ebfded89
Author: Stephane Glondu <steph at glondu.net>
Date: Fri Oct 13 14:45:18 2017 +0200
Properly fix installation on bytecode architectures (Closes: #878236)
---
...ix-installation-on-bytecode-architectures.patch | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/debian/patches/0001-Fix-installation-on-bytecode-architectures.patch b/debian/patches/0001-Fix-installation-on-bytecode-architectures.patch
index cab0463..564ebbd 100644
--- a/debian/patches/0001-Fix-installation-on-bytecode-architectures.patch
+++ b/debian/patches/0001-Fix-installation-on-bytecode-architectures.patch
@@ -4,19 +4,19 @@ Subject: Fix installation on bytecode architectures
Bug-Debian: https://bugs.debian.org/878236
---
- myocamlbuild.ml | 2 +-
+ setup.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/myocamlbuild.ml b/myocamlbuild.ml
-index 0b8b171..0a540dc 100644
---- a/myocamlbuild.ml
-+++ b/myocamlbuild.ml
-@@ -851,7 +851,7 @@ module MyOCamlbuildBase = struct
- flag ["link"; "library"; "ocaml"; "native"; tag_libstubs lib]
- (S[A"-cclib"; A("-l"^(nm_libstubs lib))]);
-
-- if bool_of_string (BaseEnvLight.var_get "native_dynlink" env) then
-+ if true || bool_of_string (BaseEnvLight.var_get "native_dynlink" env) then
- flag ["link"; "program"; "ocaml"; "byte"; tag_libstubs lib]
- (S[A"-dllib"; A("dll"^(nm_libstubs lib))]);
-
+diff --git a/setup.ml b/setup.ml
+index 50f5804..34cfb07 100644
+--- a/setup.ml
++++ b/setup.ml
+@@ -2449,7 +2449,7 @@ module OASISLibrary = struct
+ if bs.bs_c_sources <> [] then begin
+ ["lib"^cs.cs_name^"_stubs"^ext_lib]
+ ::
+- if has_native_dynlink then
++ if true || has_native_dynlink then
+ ["dll"^cs.cs_name^"_stubs"^ext_dll] :: acc_nopath
+ else
+ acc_nopath
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/lwt.git
More information about the Pkg-ocaml-maint-commits
mailing list