[Pkg-ocaml-maint-commits] [SCM] apron packaging branch, master, updated. debian/0.9.10-3-3-g73b2092

[Samuel Mimram]

The following commit has been merged in the master branch:
commit 73b20927aeb227ef88015aabef6ee1d9b42a6425
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Wed Dec 2 16:34:08 2009 +0100

    Patch in order to resolve symbols.

diff --git a/debian/changelog b/debian/changelog
index d25daa1..9cb1cbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 apron (0.9.10-4) UNRELEASED; urgency=low
 
+  [ Mehdi Dogguy ]
   * Remove non-needed Provides for libapron-dev
   * Version the build dependency on quilt: >= 0.46-7
 
- -- Mehdi Dogguy <mehdi at debian.org>  Tue, 17 Nov 2009 22:59:38 +0100
+  [ Samuel Mimram ]
+  * Added link patch in order to resolve symbols, closes: #558838.
+
+ -- Samuel Mimram <smimram at debian.org>  Wed, 02 Dec 2009 16:32:57 +0100
 
 apron (0.9.10-3) unstable; urgency=low
 
diff --git a/debian/patches/link b/debian/patches/link
new file mode 100644
index 0000000..8c9ac01
--- /dev/null
+++ b/debian/patches/link
@@ -0,0 +1,78 @@
+Index: apron/apron/apron/Makefile
+===================================================================
+--- apron.orig/apron/apron/Makefile	2009-12-02 16:22:49.000000000 +0100
++++ apron/apron/apron/Makefile	2009-12-02 16:22:49.000000000 +0100
+@@ -133,7 +133,7 @@
+ 
+ libapron.so: $(C_FILES:%.c=%.o) $(C_FILES_AUX:%.c=%MPQ.o) $(C_FILES_AUX:%.c=%D.o)  $(C_FILES_AUX:%.c=%MPFR.o) ../itv/libitv.a
+ 	for i in `$(AR) t ../itv/libitv.a`; do ln -s ../itv/$$i $$i; done
+-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@.0 -o $@ $(C_FILES:%.c=%.o) $(C_FILES_AUX:%.c=%MPQ.o) $(C_FILES_AUX:%.c=%D.o) $(C_FILES_AUX:%.c=%MPFR.o) `$(AR) t ../itv/libitv.a`
++	$(CC) $(CFLAGS) -lm -lmpfr -lgmp -shared -Wl,-soname,$@.0 -o $@ $(C_FILES:%.c=%.o) $(C_FILES_AUX:%.c=%MPQ.o) $(C_FILES_AUX:%.c=%D.o) $(C_FILES_AUX:%.c=%MPFR.o) `$(AR) t ../itv/libitv.a`
+ 	for i in `$(AR) t ../itv/libitv.a`; do $(RM) $$i; done
+ 
+ libapron_debug.so: $(C_FILES:%.c=%_debug.o) $(C_FILES_AUX:%.c=%MPQ_debug.o) $(C_FILES_AUX:%.c=%D_debug.o) $(C_FILES_AUX:%.c=%MPFR_debug.o) ../itv/libitv_debug.a
+Index: apron/apron/box/Makefile
+===================================================================
+--- apron.orig/apron/box/Makefile	2009-12-02 16:22:49.000000000 +0100
++++ apron/apron/box/Makefile	2009-12-02 16:27:05.000000000 +0100
+@@ -151,7 +151,7 @@
+ 	$(AR) rcs $@ $^
+ 	$(RANLIB) $@
+ libbox%.so:  $(subst .c,%.o,$(CCMODULES:%=%.c))
+-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^
++	$(CC) $(CFLAGS) -lm -lgmp -lmpfr -lapron -shared -Wl,-soname,$@.0 -o $@ $^
+ libbox%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
+ 	$(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
+ 
+Index: apron/apron/newpolka/Makefile
+===================================================================
+--- apron.orig/apron/newpolka/Makefile	2009-12-02 16:22:49.000000000 +0100
++++ apron/apron/newpolka/Makefile	2009-12-02 16:22:49.000000000 +0100
+@@ -176,7 +176,7 @@
+ 	$(AR) rcs $@ $^
+ 	$(RANLIB) $@
+ libpolka%.so:  $(subst .c,%.o,$(CCMODULES:%=%.c))
+-	$(CC) $(CFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^
++	$(CC) $(CFLAGS) -lgmp -lapron -shared -Wl,-soname,$@.0 -o $@ $^
+ libpolka%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
+ 	$(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
+ 
+Index: apron/apron/octagons/Makefile
+===================================================================
+--- apron.orig/apron/octagons/Makefile	2009-12-02 16:22:49.000000000 +0100
++++ apron/apron/octagons/Makefile	2009-12-02 16:22:49.000000000 +0100
+@@ -174,7 +174,7 @@
+ 	$(RANLIB) $@
+ 
+ liboct%.so: $(subst .c,%.o,$(CCSOURCES))
+-	$(SHARED) -Wl,-soname,$@.0 -o $@ $^
++	$(SHARED) -lm -lgmp -lmpfr -lapron -Wl,-soname,$@.0 -o $@ $^
+ 
+ octtest%: liboct%_debug.a oct_test%.o
+ 	$(CC) $(CFLAGS_DEBUG) $(ICFLAGS) -o $@ oct_test$*.o \
+Index: apron/apron/ppl/Makefile
+===================================================================
+--- apron.orig/apron/ppl/Makefile	2009-12-02 16:22:49.000000000 +0100
++++ apron/apron/ppl/Makefile	2009-12-02 16:22:49.000000000 +0100
+@@ -126,7 +126,7 @@
+ 	$(AR) rcs $@ $^
+ 	$(RANLIB) $@
+ libap_ppl.so: $(subst .cc,.o,$(CXXSOURCES))
+-	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^ -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
++	$(CXX) $(CXXFLAGS) -lgmp -lapron -shared -Wl,-soname,$@.0 -o $@ $^ -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
+ libap_ppl_debug.so: $(subst .cc,_debug.o,$(CXXSOURCES))
+ 	$(CXX) $(CXXFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^ -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
+ 
+Index: apron/apron/products/Makefile
+===================================================================
+--- apron.orig/apron/products/Makefile	2009-12-02 16:22:49.000000000 +0100
++++ apron/apron/products/Makefile	2009-12-02 16:30:48.000000000 +0100
+@@ -109,7 +109,7 @@
+ 	$(AR) rcs $@ $^
+ 	$(RANLIB) $@
+ libap_pkgrid.so: ap_pkgrid.o
+-	$(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^
++	$(CXX) $(CXXFLAGS) -lgmp -lapron -shared -Wl,-soname,$@.0 -o $@ $^
+ libap_pkgrid_debug.so: ap_pkgrid_debug.o
+ 	$(CXX) $(CXXFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 00cda0e..2d6d665 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 rpath.diff
 soname.diff
 nonopt.diff
+link

-- 
apron packaging