This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository frama-c.
commit 435e0c12d4edb920c0715881db1326e61cd6f7b5
Author: Mehdi Dogguy <me...@debian.org>
Date: Sat Jan 23 23:57:18 2016 +0100
Fix ocaml-dangling-cmx and ocaml-dangling-cmxa.
---
debian/changelog | 1 +
debian/rules | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 570e544..4f9b0ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ frama-c (20151002+magnesium+dfsg-1) UNRELEASED; urgency=medium
since they became a hard requirement.
* Fix variable FRAMA_GUI_LIBS in debian/rules: "gui" directory
moved from "src" to "src/plugins".
+ * Fix ocaml-dangling-cmx and ocaml-dangling-cmxa.
-- Mehdi Dogguy <me...@debian.org> Thu, 21 Jan 2016 23:07:15 +0100
diff --git a/debian/rules b/debian/rules
index 56edb15..3165391 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ include /usr/share/ocaml/ocamlvars.mk
FRAMA_DIR=$(CURDIR)/debian/tmp
FRAMA_GUI_DIR=$(CURDIR)/debian/frama-c/usr/lib/frama-c
+FRAMA_PLUGINS_DIR=$(CURDIR)/debian/frama-c-base/usr/lib/frama-c/plugins/
override_dh_auto_configure:
mkdir -p lib/plugins
@@ -26,6 +27,7 @@ override_dh_auto_configure:
LDFLAGS="-Wl,-z,defs"
FRAMA_GUI_LIBS=$(patsubst src/plugins/gui/%.ml,
$(FRAMA_DIR)/usr/lib/frama-c/%, $(wildcard src/plugins/gui/*.ml))
+FRAMA_PLUGINS=$(wildcard lib/plugins/*.cmx lib/plugins/*.cmxa)
override_dh_auto_install:
$(MAKE) prefix=$(FRAMA_DIR)/usr
FRAMAC_DATADIR=$(FRAMA_DIR)/usr/share/frama-c install
@@ -51,6 +53,9 @@ endif
ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
mv $(patsubst %, %.cmx, $(FRAMA_GUI_LIBS)) $(FRAMA_GUI_DIR)
mv $(patsubst %, %.o, $(FRAMA_GUI_LIBS)) $(FRAMA_GUI_DIR)
+ mkdir -p $(FRAMA_PLUGINS_DIR)
+ cp $(patsubst %.cmx, %.o, $(patsubst %.cmxa, %.a,$(FRAMA_PLUGINS))) \
+ $(FRAMA_PLUGINS_DIR)
endif
override_dh_auto_clean:
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/frama-c.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
