[Pkg-ocaml-maint-commits] [SCM] frama-c packaging branch, master, updated. debian/20090601.beta1+dfsg-1-3-g8f6cc2a

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit cda4b08aebdf37594d8bc7bf3f4283f542294ca0
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date:   Tue Sep 1 12:03:45 2009 +0200

    Link statically Jessie plugin
    
    Add a patch that fixes compilation error when linking jessie
    statically and using a system-wide installation of the jessie library:
    
    One needs to add jc.cm{x,o} when linking.

diff --git a/debian/patches/0004-Add-JCCM-O-X-to-BYTE-OPT-_LIBS-when-linking-statical.patch b/debian/patches/0004-Add-JCCM-O-X-to-BYTE-OPT-_LIBS-when-linking-statical.patch
new file mode 100644
index 0000000..9f922aa
--- /dev/null
+++ b/debian/patches/0004-Add-JCCM-O-X-to-BYTE-OPT-_LIBS-when-linking-statical.patch
@@ -0,0 +1,28 @@
+From: Mehdi Dogguy <dogguy at pps.jussieu.fr>
+Date: Tue, 1 Sep 2009 14:26:15 +0200
+Subject: [PATCH] Add JCCM{O,X} to {BYTE,OPT}_LIBS when linking statically the jessie plugin
+
+---
+ Makefile.in |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 2e0f6b3..7e935b9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -933,6 +933,14 @@ JCCMO		:=@JCCMO@
+ JCCMX		:=@JCCMX@
+ WHY_DISTRIB	:=@WHYDISTRIB@
+ 
++ifeq (@JESSIE_LOCAL@,no)
++ifneq (@ENABLE_JESSIE@,no)
++INCLUDES  += $(JESSIE_INCLUDES)
++BYTE_LIBS += $(JCCMO)
++OPT_LIBS  += $(JCCMX)
++endif
++endif
++
+ DISTRIB_FILES += $(PLUGIN_DIR)/Makefile
+ include $(PLUGIN_DIR)/Makefile
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 9d296ee..6e3670a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0006-Do-not-install-non-existant-files.patch
 0002-Do-not-add-GRAPH_GUICMO-to-BYTE_GUI_LIBS.patch
 0003-Fix-weak-pattern-matching-in-dynlink_lower_311_byte..patch
+0004-Add-JCCM-O-X-to-BYTE-OPT-_LIBS-when-linking-statical.patch
diff --git a/debian/rules b/debian/rules
index 1924942..5352f0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ override_dh_auto_configure: ocamlinit-stamp
 		--infodir=\$${prefix}/share/info \
 		--datarootdir=\$${prefix}/lib    \
 		--with-why-dir=no		 \
+		--with-jessie-static		 \
 		--disable-impact		 \
 		--disable-security		 \
 		--enable-verbosemake             \

-- 
frama-c packaging