[Pkg-ocaml-maint-commits] [dose3] 06/09: really build cmx
Ralf Treinen
treinen at moszumanska.debian.org
Tue Oct 21 19:15:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository dose3.
commit e1184a78bb7597e63bd2a7d53b809042a93446e0
Author: Ralf Treinen <treinen at free.fr>
Date: Tue Oct 21 20:43:43 2014 +0200
really build cmx
---
debian/changelog | 1 +
debian/patches/build-cmx | 30 ++++++++++++++++++++++++++++++
debian/patches/series | 3 ++-
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 329cd10..b4bb425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ dose3 (3.3~beta1-1) UNRELEASED; urgency=low
* new patches, cherry-picked from upstream git:
- doc-target (fix doc target of Makefile)
- installcudf-target (restore that target which was accidentially dropped)
+ - build-cmx (really build cmx)
* add rudimentary as-installed package tests for dose-debcheck,
dose-builddebcheck, dose-outdated
* debian/control: replace Conflicts: by Breaks:
diff --git a/debian/patches/build-cmx b/debian/patches/build-cmx
new file mode 100644
index 0000000..0603b0d
--- /dev/null
+++ b/debian/patches/build-cmx
@@ -0,0 +1,30 @@
+Author: Pietro Abate <pietro.abate at pps.jussieu.fr>
+Description: Now really build cmx cmxs a
+Upstream commit: 3a9505c436d3e13f699b8e73e3671cca60def2ae
+
+diff --git a/Makefile b/Makefile
+index b4f4957..d068d76 100644
+--- a/Makefile
++++ b/Makefile
+@@ -138,7 +138,7 @@ $(DOSELIBS)/doseparseNoRpm.%: $(DOSELIBS)/debian.% $(DOSELIBS)/eclipse.%
+
+ clean:
+ $(OCAMLBUILD) -clean
+- rm -f applications/apps.itarget applications/.itarget
++ rm -f applications/apps.itarget
+ cd doc && $(MAKE) clean
+
+ distclean: clean
+diff --git a/Makefile.config.in b/Makefile.config.in
+index 446d124..b0277db 100644
+--- a/Makefile.config.in
++++ b/Makefile.config.in
+@@ -95,7 +95,7 @@ uninstallcudf:
+ endif
+
+ ifeq ("@OCAMLEXT@","native")
+- SUFFIX += cmxa cmxs a
++ SUFFIX += cmxa cmxs a
+ OPTLIBS += $(BYTELIBS:%.cma=%.cmxa)
+ CMXSLIBS += $(BYTELIBS:%.cma=%.cmxs)
+ ALIBS = $(BYTELIBS:%.cma=%.a)
diff --git a/debian/patches/series b/debian/patches/series
index c396b53..0acbadb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
binaries-prefix-edos
coinstall-binary-name
doc-target
-installcudf-target
\ No newline at end of file
+installcudf-target
+build-cmx
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/dose3.git
More information about the Pkg-ocaml-maint-commits
mailing list