[packages/ocaml-dbm] - added no-ocamlopt patch (applied only if building without ocaml_opt)

qboosh qboosh at pld-linux.org
Sun Jul 19 09:13:29 CEST 2015


commit 7eea36a2edf71ca7a51adb41f186341df6b2bfdb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 19 09:14:43 2015 +0200

    - added no-ocamlopt patch (applied only if building without ocaml_opt)

 ocaml-dbm-no-ocamlopt.patch | 22 ++++++++++++++++++++++
 ocaml-dbm.spec              |  2 ++
 2 files changed, 24 insertions(+)
---
diff --git a/ocaml-dbm.spec b/ocaml-dbm.spec
index 883dbaf..eaec397 100644
--- a/ocaml-dbm.spec
+++ b/ocaml-dbm.spec
@@ -17,6 +17,7 @@ Group:		Libraries
 Source0:	https://forge.ocamlcore.org/frs/download.php/728/camldbm-%{version}.tgz
 # Source0-md5:	79a297c0e0c54fbb3c7e795359e5f902
 Patch0:		%{name}-destdir.patch
+Patch1:		%{name}-no-ocamlopt.patch
 URL:		https://forge.ocamlcore.org/projects/camldbm/
 BuildRequires:	db-devel
 BuildRequires:	ocaml >= 1:4
@@ -50,6 +51,7 @@ DBM biblioteki.
 %prep
 %setup -q -n camldbm-%{version}
 %patch0 -p1
+%{!?with_ocaml_opt:%patch1 -p1}
 
 %build
 # instead of unpredictable configure
diff --git a/ocaml-dbm-no-ocamlopt.patch b/ocaml-dbm-no-ocamlopt.patch
new file mode 100644
index 0000000..ae3d9ac
--- /dev/null
+++ b/ocaml-dbm-no-ocamlopt.patch
@@ -0,0 +1,22 @@
+--- camldbm-1.0/Makefile.orig	2015-07-19 09:03:19.668090539 +0200
++++ camldbm-1.0/Makefile	2015-07-19 09:13:42.181398010 +0200
+@@ -25,7 +25,7 @@
+ STUBLIBDIR=$(LIBDIR)/stublibs
+ 
+ 
+-all: libcamldbm.$(A) dbm.cma dbm.cmxa dbm.cmxs 
++all: libcamldbm.$(A) dbm.cma
+ 
+ dbm.cma: dbm.cmo
+ 	$(OCAMLMKLIB) -o dbm -oc camldbm -linkall dbm.cmo $(DBM_LINK)
+@@ -60,9 +60,7 @@
+ 	if test -f dllcamldbm.$(SO); then cp dllcamldbm.$(SO) $(DESTDIR)$(STUBLIBDIR)/; fi 
+ 	cp libcamldbm.$(A) $(DESTDIR)$(LIBDIR)/
+ 	cd $(DESTDIR)$(LIBDIR) && ranlib libcamldbm.$(A)
+-	cp dbm.cma dbm.cmxa dbm.cmi dbm.mli $(DESTDIR)$(LIBDIR)/
+-	cp dbm.$(A) $(DESTDIR)$(LIBDIR)/
+-	cd $(DESTDIR)$(LIBDIR) && ranlib dbm.$(A)
++	cp dbm.cma dbm.cmi dbm.mli $(DESTDIR)$(LIBDIR)/
+ 	if test -f dbm.cmxs; then cp dbm.cmxs $(DESTDIR)$(LIBDIR)/; fi
+ 
+ clean::
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-dbm.git/commitdiff/7eea36a2edf71ca7a51adb41f186341df6b2bfdb



More information about the pld-cvs-commit mailing list