[packages/google-drive-ocamlfuse] - hack around fuse linking on no-opt build - rel 2

baggins baggins at pld-linux.org
Tue Jun 6 00:24:39 CEST 2017


commit 23acf6169c7d1c56deca9acc5021f79e413e4fa0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jun 6 00:23:56 2017 +0200

    - hack around fuse linking on no-opt build
    - rel 2

 google-drive-ocamlfuse.spec |  9 +++++++--
 noopt-fuse.patch            | 11 +++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/google-drive-ocamlfuse.spec b/google-drive-ocamlfuse.spec
index a7e0aea..3ad0a15 100644
--- a/google-drive-ocamlfuse.spec
+++ b/google-drive-ocamlfuse.spec
@@ -1,15 +1,19 @@
 #
 # Conditional build:
-%bcond_with	opt		# build opt
+%bcond_without	opt		# build opt
 
+%ifarch x32
+%undefine	with_opt
+%endif
 Summary:	FUSE filesystem over Google Drive
 Name:		google-drive-ocamlfuse
 Version:	0.6.19
-Release:	1
+Release:	2
 License:	BSD
 Group:		Applications/Networking
 Source0:	https://github.com/astrada/google-drive-ocamlfuse/archive/v%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	073edcd123b517adc37076b6be211500
+Patch0:		noopt-fuse.patch
 URL:		https://github.com/astrada/google-drive-ocamlfuse
 BuildRequires:	cppo >= 0.9.3
 BuildRequires:	ocaml >= 3.04-7
@@ -58,6 +62,7 @@ tej biblioteki.
 
 %prep
 %setup -q
+%{!?with_opt:%patch0 -p1}
 
 %build
 ocaml setup.ml -configure \
diff --git a/noopt-fuse.patch b/noopt-fuse.patch
new file mode 100644
index 0000000..e94cd33
--- /dev/null
+++ b/noopt-fuse.patch
@@ -0,0 +1,11 @@
+--- google-drive-ocamlfuse-0.6.19/myocamlbuild.ml.orig	2017-06-06 00:21:04.349434462 +0200
++++ google-drive-ocamlfuse-0.6.19/myocamlbuild.ml	2017-06-06 00:20:41.865494433 +0200
+@@ -645,6 +645,8 @@
+         (* When one link an OCaml library/binary/package, one should use
+          * -linkpkg *)
+         flag ["ocaml"; "link"; "program"] & A"-linkpkg";
++        flag ["ocaml"; "link"; "program"] & A"-warn-error";
++        flag ["ocaml"; "link"; "program"] & A"-a";
+ 
+         (* For each ocamlfind package one inject the -package option when
+          * compiling, computing dependencies, generating documentation and
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/google-drive-ocamlfuse.git/commitdiff/23acf6169c7d1c56deca9acc5021f79e413e4fa0



More information about the pld-cvs-commit mailing list