[Pkg-ocaml-maint-commits] [SCM] apron packaging branch, master, updated. upstream/0.9.10-11-gc293771
Samuel Mimram
samuel.mimram at ens-lyon.org
Sun Oct 25 15:08:34 UTC 2009
The following commit has been merged in the master branch:
commit 4f8ad904021e9fe40da97722355e6146dbabcbba
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date: Sun Oct 25 15:51:46 2009 +0100
Correct implementation of sonames.
diff --git a/debian/libapron-dev.install b/debian/libapron-dev.install
index e43b95c..9c03258 100644
--- a/debian/libapron-dev.install
+++ b/debian/libapron-dev.install
@@ -1 +1,9 @@
+usr/lib/libapron.so
+usr/lib/libboxD.so
+usr/lib/libboxMPFR.so
+usr/lib/libboxMPQ.so
+usr/lib/liboctD.so
+usr/lib/liboctMPQ.so
+usr/lib/libpolkaMPQ.so
+usr/lib/libpolkaRll.so
usr/include
diff --git a/debian/libapron-ocaml.install b/debian/libapron-ocaml.install
index a822ae0..83525e4 100644
--- a/debian/libapron-ocaml.install
+++ b/debian/libapron-ocaml.install
@@ -1,2 +1,2 @@
usr/lib/dll*.so /usr/lib/ocaml/stublibs
-usr/lib/*_caml*.so /usr/lib/ocaml/stublibs
+usr/lib/*_caml.so /usr/lib/ocaml/stublibs
diff --git a/debian/libapron.install b/debian/libapron.install
index bc921c1..098263b 100644
--- a/debian/libapron.install
+++ b/debian/libapron.install
@@ -1,16 +1,8 @@
-usr/lib/libapron_debug.so
-usr/lib/libapron.so
-usr/lib/libboxD_debug.so
-usr/lib/libboxD.so
-usr/lib/libboxMPFR_debug.so
-usr/lib/libboxMPFR.so
-usr/lib/libboxMPQ_debug.so
-usr/lib/libboxMPQ.so
-usr/lib/liboctD_debug.so
-usr/lib/liboctD.so
-usr/lib/liboctMPQ_debug.so
-usr/lib/liboctMPQ.so
-usr/lib/libpolkaMPQ_debug.so
-usr/lib/libpolkaMPQ.so
-usr/lib/libpolkaRll_debug.so
-usr/lib/libpolkaRll.so
+usr/lib/libapron.so.*
+usr/lib/libboxD.so.*
+usr/lib/libboxMPFR.so.*
+usr/lib/libboxMPQ.so.*
+usr/lib/liboctD.so.*
+usr/lib/liboctMPQ.so.*
+usr/lib/libpolkaMPQ.so.*
+usr/lib/libpolkaRll.so.*
diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff
index 1c2e50f..0c6a655 100644
--- a/debian/patches/soname.diff
+++ b/debian/patches/soname.diff
@@ -6,97 +6,97 @@
@DPATCH@
Index: apron/apron/apron/Makefile
===================================================================
---- apron.orig/apron/apron/Makefile 2009-10-25 14:54:21.000000000 +0100
-+++ apron/apron/apron/Makefile 2009-10-25 14:57:40.000000000 +0100
+--- apron.orig/apron/apron/Makefile 2009-10-25 15:36:44.000000000 +0100
++++ apron/apron/apron/Makefile 2009-10-25 15:39:19.000000000 +0100
@@ -133,12 +133,12 @@
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 -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) -shared -Wl,-soname,libapron.so.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) -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
for i in `$(AR) t ../itv/libitv_debug.a`; do ln -s ../itv/$$i $$i; done
- $(CC) $(CFLAGS_DEBUG) -shared -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_debug.a`
-+ $(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,libapron_debug.so.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_debug.a`
++ $(CC) $(CFLAGS_DEBUG) -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_debug.a`
for i in `$(AR) t ../itv/libitv_debug.a`; do $(RM) $$i; done
.PHONY : dep
Index: apron/apron/box/Makefile
===================================================================
---- apron.orig/apron/box/Makefile 2009-10-25 14:57:09.000000000 +0100
-+++ apron/apron/box/Makefile 2009-10-25 14:57:40.000000000 +0100
+--- apron.orig/apron/box/Makefile 2009-10-25 15:36:44.000000000 +0100
++++ apron/apron/box/Makefile 2009-10-25 15:38:09.000000000 +0100
@@ -145,9 +145,9 @@
$(AR) rcs $@ $^
$(RANLIB) $@
libbox%.so: $(subst .c,%.o,$(CCMODULES:%=%.c))
- $(CC) $(CFLAGS) -shared -o $@ $^
-+ $(CC) $(CFLAGS) -shared -Wl,-soname,libbox.so.0 -o $@ $^
++ $(CC) $(CFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^
libbox%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
- $(CC) $(CFLAGS_DEBUG) -shared -o $@ $^
-+ $(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,libbox_debug.so.0 -o $@ $^
++ $(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
%MPQ.o: %.c
$(CC) $(CFLAGS) $(ICFLAGS) -DNUM_MPQ -c -o $@ $<
Index: apron/apron/newpolka/Makefile
===================================================================
---- apron.orig/apron/newpolka/Makefile 2009-10-25 14:57:09.000000000 +0100
-+++ apron/apron/newpolka/Makefile 2009-10-25 14:57:40.000000000 +0100
+--- apron.orig/apron/newpolka/Makefile 2009-10-25 15:36:44.000000000 +0100
++++ apron/apron/newpolka/Makefile 2009-10-25 15:39:51.000000000 +0100
@@ -169,9 +169,9 @@
$(AR) rcs $@ $^
$(RANLIB) $@
libpolka%.so: $(subst .c,%.o,$(CCMODULES:%=%.c))
- $(CC) $(CFLAGS) -shared -o $@ $^
-+ $(CC) $(CFLAGS) -shared -Wl,-soname,libpolka.so.0 -o $@ $^
++ $(CC) $(CFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^
libpolka%_debug.so: $(subst .c,%_debug.o,$(CCMODULES:%=%.c))
- $(CC) $(CFLAGS_DEBUG) -shared -o $@ $^
-+ $(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,libpolka_debug.so.0 -o $@ $^
++ $(CC) $(CFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
%Rl.o: %.c $(CCINC)
$(CC) $(CFLAGS) $(ICFLAGS) -DNUM_LONGRAT -c -o $@ $<
Index: apron/apron/octagons/Makefile
===================================================================
---- apron.orig/apron/octagons/Makefile 2009-10-25 14:57:09.000000000 +0100
-+++ apron/apron/octagons/Makefile 2009-10-25 14:57:40.000000000 +0100
+--- apron.orig/apron/octagons/Makefile 2009-10-25 15:36:44.000000000 +0100
++++ apron/apron/octagons/Makefile 2009-10-25 15:40:08.000000000 +0100
@@ -174,7 +174,7 @@
$(RANLIB) $@
liboct%.so: $(subst .c,%.o,$(CCSOURCES))
- $(SHARED) -o $@ $^
-+ $(SHARED) -Wl,-soname,liboct.so.0 -o $@ $^
++ $(SHARED) -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-10-25 14:57:26.000000000 +0100
-+++ apron/apron/ppl/Makefile 2009-10-25 14:58:33.000000000 +0100
+--- apron.orig/apron/ppl/Makefile 2009-10-25 15:36:44.000000000 +0100
++++ apron/apron/ppl/Makefile 2009-10-25 15:40:27.000000000 +0100
@@ -126,9 +126,9 @@
$(AR) rcs $@ $^
$(RANLIB) $@
libap_ppl.so: $(subst .cc,.o,$(CXXSOURCES))
- $(CXX) $(CXXFLAGS) -shared -o $@ $^ -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
-+ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,libap_ppl.so.0 -o $@ $^ -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
++ $(CXX) $(CXXFLAGS) -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 -o $@ $^ -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
-+ $(CXX) $(CXXFLAGS_DEBUG) -shared -Wl,-soname,libap_ppl_debug.so.0 -o $@ $^ -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
++ $(CXX) $(CXXFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^ -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
ap_ppl_test: libap_ppl_debug.a ppl_test_debug.o
$(CXX) $(CXXFLAGS) -o $@ ppl_test_debug.o \
Index: apron/apron/products/Makefile
===================================================================
---- apron.orig/apron/products/Makefile 2009-10-25 14:57:09.000000000 +0100
-+++ apron/apron/products/Makefile 2009-10-25 14:57:40.000000000 +0100
+--- apron.orig/apron/products/Makefile 2009-10-25 15:36:44.000000000 +0100
++++ apron/apron/products/Makefile 2009-10-25 15:40:47.000000000 +0100
@@ -106,9 +106,9 @@
$(AR) rcs $@ $^
$(RANLIB) $@
libap_pkgrid.so: ap_pkgrid.o
- $(CXX) $(CXXFLAGS) -shared -o $@ $^
-+ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,libap_pkgrid.so.0 -o $@ $^
++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$@.0 -o $@ $^
libap_pkgrid_debug.so: ap_pkgrid_debug.o
- $(CXX) $(CXXFLAGS_DEBUG) -shared -o $@ $^
-+ $(CXX) $(CXXFLAGS_DEBUG) -shared -Wl,-soname,libap_pkgrid_debug.so.0 -o $@ $^
++ $(CXX) $(CXXFLAGS_DEBUG) -shared -Wl,-soname,$@.0 -o $@ $^
#---------------------------------------
# C rules
diff --git a/debian/rules b/debian/rules
index 6a61b57..dd78d6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,3 +32,7 @@ override_dh_auto_install:
$(MAKE) install
$(MAKE) -C apron install
chmod -x debian/tmp/usr/lib/*
+ for i in libapron.so libboxD.so libboxMPFR.so libboxMPQ.so liboctD.so liboctMPQ.so libpolkaMPQ.so libpolkaRll.so; do \
+ mv debian/tmp/usr/lib/$$i debian/tmp/usr/lib/$$i.0; \
+ ln -s $$i.0 debian/tmp/usr/lib/$$i; \
+ done
--
apron packaging
More information about the Pkg-ocaml-maint-commits
mailing list