[Pkg-ocaml-maint-commits] [SCM] apron packaging branch, master, updated. upstream/0.9.10-8-gf0111f3

Samuel Mimram samuel.mimram at ens-lyon.org
Sun Oct 25 14:00:41 UTC 2009


The following commit has been merged in the master branch:
commit f0111f38cc13edd92bfee662004fff9295f2e84a
Author: Samuel Mimram <samuel.mimram at ens-lyon.org>
Date:   Sun Oct 25 14:59:29 2009 +0100

    Add patches for removing rpath and defining sonames.

diff --git a/debian/patches/rpath.diff b/debian/patches/rpath.diff
new file mode 100644
index 0000000..9b5d607
--- /dev/null
+++ b/debian/patches/rpath.diff
@@ -0,0 +1,208 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## rpath.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## Remove rpaths.
+
+ at DPATCH@
+Index: apron/apron/box/Makefile
+===================================================================
+--- apron.orig/apron/box/Makefile	2009-10-25 14:54:21.000000000 +0100
++++ apron/apron/box/Makefile	2009-10-25 14:57:09.000000000 +0100
+@@ -178,9 +178,9 @@
+ 	$(RANLIB) $@
+ 
+ libbox%_caml.so: box_caml.o libbox%.so
+-	$(CC) $(CFLAGS) -shared -o $@ box_caml.o  -L. -lbox$* -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(CC) $(CFLAGS) -shared -o $@ box_caml.o  -L. -lbox$*
+ libbox%_caml_debug.so: box_caml_debug.o libbox%_debug.so
+-	$(CC) $(CFLAGS8DEBUG) -shared -o $@ box_caml_debug.o -L. -lbox$*_debug -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(CC) $(CFLAGS8DEBUG) -shared -o $@ box_caml_debug.o -L. -lbox$*_debug
+ 
+ dllbox%_caml.so: libbox%_caml.so
+ 	ln -s -f $^ $@
+@@ -204,10 +204,10 @@
+ 	ln -s -f $^ $@
+ 
+ box%.cma: box.cmo libbox%_caml.a libbox%.a
+-	$(OCAMLMKLIB) -ocamlc "$(OCAMLC)" -verbose -o box$* -oc box$*_caml box.cmo -lbox$* -L$(APRON_PREFIX)/lib -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlc "$(OCAMLC)" -verbose -o box$* -oc box$*_caml box.cmo -lbox$* -L$(APRON_PREFIX)/lib
+ 
+ box%.cmxa box%.a: box.cmx libbox%_caml.a libbox%.a
+-	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT)" -verbose -o box$* -oc box$*_caml box.cmx -lbox$* -L$(APRON_PREFIX)/lib -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT)" -verbose -o box$* -oc box$*_caml box.cmx -lbox$* -L$(APRON_PREFIX)/lib
+ 
+ #---------------------------------------
+ # IDL rules
+Index: apron/apron/mlapronidl/Makefile
+===================================================================
+--- apron.orig/apron/mlapronidl/Makefile	2009-10-25 14:54:21.000000000 +0100
++++ apron/apron/mlapronidl/Makefile	2009-10-25 14:57:09.000000000 +0100
+@@ -105,10 +105,10 @@
+ #---------------------------------------
+ 
+ apron.cma: apron.cmo libapron_caml.a
+-	$(OCAMLMKLIB) -ocamlc "$(OCAMLC)" -verbose -o apron -oc apron_caml apron.cmo -lapron -L$(APRON_PREFIX)/lib -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlc "$(OCAMLC)" -verbose -o apron -oc apron_caml apron.cmo -lapron -L$(APRON_PREFIX)/lib
+ 
+ apron.cmxa: apron.cmx libapron_caml.a
+-	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT)" -verbose -o apron -oc apron_caml apron.cmx -lapron -L$(APRON_PREFIX)/lib -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT)" -verbose -o apron -oc apron_caml apron.cmx -lapron -L$(APRON_PREFIX)/lib
+ 
+ libapron_caml.a: $(CCMODULES:%=%.o)
+ 	$(AR) rc $@ $^
+@@ -118,10 +118,10 @@
+ 	$(RANLIB) $@
+ 
+ libapron_caml.so: $(CCMODULES:%=%.o) ../apron/libapron.so
+-	$(CC) $(CFLAGS) -shared -o $@ $(CCMODULES:%=%.o) -L../apron -lapron -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(CC) $(CFLAGS) -shared -o $@ $(CCMODULES:%=%.o) -L../apron -lapron
+ 
+ libapron_caml_debug.so: $(CCMODULES:%=%_debug.o) ../apron/libapron_debug.so
+-	$(CC) $(CFLAGS_DEBUG) -shared -o $@ $(CCMODULES:%=%_debug.o) -L../apron -lapron -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(CC) $(CFLAGS_DEBUG) -shared -o $@ $(CCMODULES:%=%_debug.o) -L../apron -lapron
+ 
+ dllapron_caml.so: libapron_caml.so
+ 	ln -s $^ $@
+Index: apron/apron/newpolka/Makefile
+===================================================================
+--- apron.orig/apron/newpolka/Makefile	2009-10-25 14:54:21.000000000 +0100
++++ apron/apron/newpolka/Makefile	2009-10-25 14:57:09.000000000 +0100
+@@ -209,9 +209,9 @@
+ 	$(RANLIB) $@
+ 
+ libpolka%_caml.so: polka_caml.o libpolka%.so
+-	$(CC) $(CFLAGS) -shared -o $@ polka_caml.o -L. -lpolka$* -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(CC) $(CFLAGS) -shared -o $@ polka_caml.o -L. -lpolka$*
+ libpolka%_caml_debug.so: polka_caml_debug.o libpolka%_debug.so
+-	$(CC) $(CFLAGS_DEBUG) -shared -o $@ polka_caml_debug.o -L. -lpolka$*_debug -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(CC) $(CFLAGS_DEBUG) -shared -o $@ polka_caml_debug.o -L. -lpolka$*_debug
+ 
+ dllpolka%_caml.so: libpolka%_caml.so
+ 	ln -s -f $^ $@
+@@ -230,10 +230,10 @@
+ 	ln -s -f $^ $@
+ 
+ polka%.cma: polka.cmo libpolka%_caml.a libpolka%.a
+-	$(OCAMLMKLIB) -ocamlc "$(OCAMLC)" -verbose -o polka$* -oc polka$*_caml polka.cmo -lpolka$* -L$(APRON_PREFIX)/lib -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlc "$(OCAMLC)" -verbose -o polka$* -oc polka$*_caml polka.cmo -lpolka$* -L$(APRON_PREFIX)/lib
+ 
+ polka%.cmxa polka%.a: polka.cmx libpolka%_caml.a libpolka%.a
+-	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT)" -verbose -o polka$* -oc polka$*_caml polka.cmx -lpolka$* -L$(APRON_PREFIX)/lib -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT)" -verbose -o polka$* -oc polka$*_caml polka.cmx -lpolka$* -L$(APRON_PREFIX)/lib
+ 
+ #---------------------------------------
+ # IDL rules
+Index: apron/apron/octagons/Makefile
+===================================================================
+--- apron.orig/apron/octagons/Makefile	2009-10-25 14:54:21.000000000 +0100
++++ apron/apron/octagons/Makefile	2009-10-25 14:57:09.000000000 +0100
+@@ -277,10 +277,10 @@
+ 	ln -s -f $^ $@
+ 
+ oct%.cma: oct.cmi oct.cmo liboct%_caml.a liboct%.a
+-	$(OCAMLMKLIB) -ocamlc "$(OCAMLC)" -verbose -o oct$* -oc oct$*_caml oct.cmo -loct$* -L$(APRON_PREFIX)/lib -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlc "$(OCAMLC)" -verbose -o oct$* -oc oct$*_caml oct.cmo -loct$* -L$(APRON_PREFIX)/lib
+ 
+ oct%.cmxa oct%.a: oct.cmi oct.cmx liboct%_caml.a liboct%.a
+-	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT)" -verbose -o oct$* -oc oct$*_caml oct.cmx -loct$* -L$(APRON_PREFIX)/lib -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT)" -verbose -o oct$* -oc oct$*_caml oct.cmx -loct$* -L$(APRON_PREFIX)/lib
+ 
+ liboct%_caml.a: oct_caml.o liboct%.a
+ 	$(AR) rcs $@ $<
+@@ -289,9 +289,9 @@
+ 	$(AR) rcs $@ $<
+ 	$(RANLIB) $@
+ liboct%_caml.so: oct_caml.o liboct%.so
+-	$(SHARED) -o $@ oct_caml.o -L. -loct$* -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(SHARED) -o $@ oct_caml.o -L. -loct$*
+ liboct%_caml_debug.so: oct_caml_debug.o liboct%_debug.so
+-	$(SHARED) -o $@ oct_caml_debug.o -L. -loct$*_debug -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(SHARED) -o $@ oct_caml_debug.o -L. -loct$*_debug
+ dlloct%_caml.so: liboct%_caml.so
+ 	ln -s -f $^ $@
+ dlloct%_caml_debug.so: liboct%_caml_debug.so
+Index: apron/apron/ppl/Makefile
+===================================================================
+--- apron.orig/apron/ppl/Makefile	2009-10-25 14:54:22.000000000 +0100
++++ apron/apron/ppl/Makefile	2009-10-25 14:57:26.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 -Wl,-rpath,$(PPL_PREFIX)/lib:$(APRON_PREFIX)/lib:$(GMP_PREFIX)/lib
++	$(CXX) $(CXXFLAGS) -shared -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 -Wl,-rpath,$(PPL_PREFIX)/lib:$(APRON_PREFIX)/lib:$(GMP_PREFIX)/lib
++	$(CXX) $(CXXFLAGS_DEBUG) -shared -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 \
+@@ -177,19 +177,19 @@
+ 	$(AR) rcs $@ $^
+ 	$(RANLIB) $@
+ libap_ppl_caml.so: ap_ppl_caml.o libap_ppl.so
+-	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_ppl -lppl -lgmpxx -L. -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib -Wl,-rpath,$(PPL_PREFIX)/lib:$(APRON_PREFIX)/lib
++	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_ppl -lppl -lgmpxx -L. -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
+ libap_ppl_caml_debug.so: ap_ppl_caml_debug.o libap_ppl_debug.so
+-	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_ppl_debug -lppl -lgmpxx -L. -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib -Wl,-rpath,$(PPL_PREFIX)/lib:$(APRON_PREFIX)/lib
++	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_ppl_debug -lppl -lgmpxx -L. -L$(PPL_PREFIX)/lib -L$(GMP_PREFIX)/lib
+ dllap_ppl_caml.so: libap_ppl_caml.so
+ 	ln -s -f $^ $@
+ dllap_ppl_caml_debug.so: libap_ppl_caml_debug.so
+ 	ln -s -f $^ $@
+ 
+ ppl.cma: ppl.cmo libap_ppl_caml.a
+-	$(OCAMLMKLIB) -ocamlc "$(OCAMLC) -cc $(CXX)" -verbose -o ppl -oc ap_ppl_caml ppl.cmo -lap_ppl -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(APRON_PREFIX)/lib -L$(GMP_PREFIX)/lib -Wl,-rpath,$(PPL_PREFIX)/lib:$(APRON_PREFIX)/lib:$(GMP_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlc "$(OCAMLC) -cc $(CXX)" -verbose -o ppl -oc ap_ppl_caml ppl.cmo -lap_ppl -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(APRON_PREFIX)/lib -L$(GMP_PREFIX)/lib
+ 
+ ppl.cmxa: ppl.cmx libap_ppl_caml.a
+-	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT) -cc $(CXX)" -verbose -o ppl -oc ap_ppl_caml ppl.cmx -lap_ppl -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(APRON_PREFIX)/lib -L$(GMP_PREFIX)/lib -Wl,-rpath,$(PPL_PREFIX)/lib:$(APRON_PREFIX)/lib:$(GMP_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT) -cc $(CXX)" -verbose -o ppl -oc ap_ppl_caml ppl.cmx -lap_ppl -lppl -lgmpxx -L$(PPL_PREFIX)/lib -L$(APRON_PREFIX)/lib -L$(GMP_PREFIX)/lib
+ 
+ manager.idl: ../mlapronidl/manager.idl
+ 	ln -s $< $@
+Index: apron/apron/products/Makefile
+===================================================================
+--- apron.orig/apron/products/Makefile	2009-10-25 14:54:22.000000000 +0100
++++ apron/apron/products/Makefile	2009-10-25 14:57:09.000000000 +0100
+@@ -121,9 +121,9 @@
+ 	$(AR) rcs $@ $^
+ 	$(RANLIB) $@
+ libpolkaGrid_caml.so: polkaGrid_caml.o libap_pkgrid.so
+-	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_pkgrid -L. -Wl-rpath,$(APRON_PREFIX)/lib
++	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_pkgrid -L.
+ libpolkaGrid_caml_debug.so: polkaGrid_caml_debug.o libap_pkgrid_debug.so
+-	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_pkgrid_debug -L. -Wl-rpath,$(APRON_PREFIX)/lib
++	$(CXX) $(CXXFLAGS) -shared -o $@ $< -lap_pkgrid_debug -L.
+ dllpolkaGrid_caml.so: libpolkaGrid_caml.so
+ 	ln -s -f $^ $@
+ dllpolkaGrid_caml_debug.so: libpolkaGrid_caml_debug.so
+@@ -134,10 +134,10 @@
+ #---------------------------------------
+ 
+ polkaGrid.cma: polkaGrid.cmo libpolkaGrid_caml.a libap_pkgrid.a
+-	$(OCAMLMKLIB) -ocamlc "$(OCAMLC) -cc $(CXX)" -verbose -o polkaGrid -oc ap_polkaGrid_caml polkaGrid.cmo -lap_polkaGrid -L$(APRON_PREFIX)/lib -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlc "$(OCAMLC) -cc $(CXX)" -verbose -o polkaGrid -oc ap_polkaGrid_caml polkaGrid.cmo -lap_polkaGrid -L$(APRON_PREFIX)/lib
+ 
+ polkaGrid.cmxa: polkaGrid.cmx libpolkaGrid_caml.a libap_pkgrid.a
+-	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT) -cc $(CXX)" -verbose -o polkaGrid -oc ap_polkaGrid_caml polkaGrid.cmx -lap_polkaGrid -L$(APRON_PREFIX)/lib -Wl,-rpath,$(APRON_PREFIX)/lib
++	$(OCAMLMKLIB) -ocamlopt "$(OCAMLOPT) -cc $(CXX)" -verbose -o polkaGrid -oc ap_polkaGrid_caml polkaGrid.cmx -lap_polkaGrid -L$(APRON_PREFIX)/lib
+ 
+ #---------------------------------------
+ # IDL rules
+Index: apron/mlgmpidl/Makefile
+===================================================================
+--- apron.orig/mlgmpidl/Makefile	2009-10-25 14:54:21.000000000 +0100
++++ apron/mlgmpidl/Makefile	2009-10-25 14:57:09.000000000 +0100
+@@ -164,9 +164,9 @@
+ 	$(RANLIB) $@
+ 
+ libgmp_caml.so: $(CCMODULES:%=%.o)
+-	$(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS) -Wl,-rpath,$(RPATH)
++	$(CC) $(CFLAGS) -shared -o $@ $^ $(LDFLAGS)
+ libgmp_caml_debug.so: $(CCMODULES:%=%.o)
+-	$(CC) $(CFLAGS_DEBUG) -shared -o $@ $^ $(LDFLAGS) -Wl,-rpath,$(RPATH)
++	$(CC) $(CFLAGS_DEBUG) -shared -o $@ $^ $(LDFLAGS)
+ 
+ dllgmp_caml.so: libgmp_caml.so
+ 	ln -s $^ $@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a754cb3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+rpath.diff
+soname.diff
diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff
new file mode 100644
index 0000000..1c2e50f
--- /dev/null
+++ b/debian/patches/soname.diff
@@ -0,0 +1,102 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## soname.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## Add sonames.
+
+ at 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
+@@ -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`
+ 	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`
+ 	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
+@@ -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 $@ $^
+ 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 $@ $^
+ 
+ %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
+@@ -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 $@ $^
+ 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 $@ $^
+ 
+ %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
+@@ -174,7 +174,7 @@
+ 	$(RANLIB) $@
+ 
+ liboct%.so: $(subst .c,%.o,$(CCSOURCES))
+-	$(SHARED) -o $@ $^
++	$(SHARED) -Wl,-soname,liboct.so.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
+@@ -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
+ 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
+ 
+ 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
+@@ -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 $@ $^
+ 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 $@ $^
+ 
+ #---------------------------------------
+ # C rules

-- 
apron packaging



More information about the Pkg-ocaml-maint-commits mailing list