This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository routino.
commit 5f1e3299de13dfe636ed8527889eb718a8ee764c Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Mon Sep 14 23:19:58 2015 +0200 Add patch to set the SONAME for libroutino{,-slim}. --- debian/changelog | 1 + debian/patches/series | 1 + debian/patches/soname | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) diff --git a/debian/changelog b/debian/changelog index c17481c..6368085 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ routino (3.0-1) UNRELEASED; urgency=medium * Strip RPATH from binaries. * Add debug package. * Update email address for upstream author. + * Add patch to set the SONAME for libroutino{,-slim}. -- Bas Couwenberg <sebas...@debian.org> Sun, 13 Sep 2015 10:47:14 +0200 diff --git a/debian/patches/series b/debian/patches/series index b083dfd..e16c249 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ install_documentation maploader mapprops hardening +soname diff --git a/debian/patches/soname b/debian/patches/soname new file mode 100644 index 0000000..248aeb7 --- /dev/null +++ b/debian/patches/soname @@ -0,0 +1,92 @@ +Description: Add SONAME for libroutino{,-slim}. +Author: Bas Couwenberg <sebas...@debian.org> + +--- a/Makefile.conf ++++ b/Makefile.conf +@@ -100,6 +100,12 @@ endif + # Put the current directory in the shared library path for the router using libroutino + LDFLAGS_LDSO=-Wl,-R. + ++# Library version for ABI compatibility ++SOVERSION=0 ++ ++# Full library version (SOVERSION.MINOR[.RELEASE]) ++LIBVERSION=$(SOVERSION).0.0 ++ + + # Required for multi-threaded support (comment these two lines out if not required) + CFLAGS+=-pthread -DUSE_PTHREADS +--- a/src/Makefile ++++ b/src/Makefile +@@ -35,7 +35,7 @@ EXE=planetsplitter$(.EXE) planetsplitter + filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE) \ + routino-router+lib$(.EXE) routino-router+lib-slim$(.EXE) + +-LIB=libroutino.so libroutino-slim.so ++LIB=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION) + + ifeq ($(HOST),MINGW) + LIB+=routino.dll routino-slim.dll +@@ -172,10 +172,10 @@ filedumper-slim$(.EXE) : $(FILEDUMPER_SL + + ROUTER_LIB_OBJ=router+lib.o + +-routino-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) libroutino.so ++routino-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) libroutino.so.$(LIBVERSION) + $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO) + +-routino-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) libroutino-slim.so ++routino-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) libroutino-slim.so.$(LIBVERSION) + $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO) + + ######## +@@ -190,10 +190,12 @@ ifeq ($(HOST),MINGW) + LIBROUTINO_OBJ+=mman-win32.o + endif + +-libroutino.so : $(LIBROUTINO_OBJ) +- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB) ++libroutino.so.$(LIBVERSION) : $(LIBROUTINO_OBJ) ++ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB) -Wl,-soname,libroutino.so.$(SOVERSION) ++ ln -s libroutino.so.$(LIBVERSION) libroutino.so.$(SOVERSION) ++ ln -s libroutino.so.$(LIBVERSION) libroutino.so + +-routino.dll : libroutino.so ++routino.dll : libroutino.so.$(LIBVERSION) + cp $< $@ + + routino.def : routino-lib.o +@@ -214,10 +216,12 @@ ifeq ($(HOST),MINGW) + LIBROUTINO_SLIM_OBJ+=mman-win32.o + endif + +-libroutino-slim.so : $(LIBROUTINO_SLIM_OBJ) +- $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB) ++libroutino-slim.so.$(LIBVERSION) : $(LIBROUTINO_SLIM_OBJ) ++ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB) -Wl,-soname,libroutino-slim.so.$(SOVERSION) ++ ln -s libroutino-slim.so.$(LIBVERSION) libroutino-slim.so.$(SOVERSION) ++ ln -s libroutino-slim.so.$(LIBVERSION) libroutino-slim.so + +-routino-slim.dll : libroutino-slim.so ++routino-slim.dll : libroutino-slim.so.$(LIBVERSION) + cp $< $@ + + routino-slim.def : routino-slim-lib.o +@@ -274,6 +278,8 @@ install-local: all-local + cp -f $$file $(DESTDIR)$(libdir) ;\ + fi ;\ + done ++ ( cd $(DESTDIR)$(libdir) && ln -s libroutino.so.$(LIBVERSION) libroutino.so.$(SOVERSION) && ln -s libroutino.$(LIBVERSION) libroutino.so ) ++ ( cd $(DESTDIR)$(libdir) && ln -s libroutino-slim.so.$(LIBVERSION) libroutino-slim.so.$(SOVERSION) && ln -s libroutino-slim.$(LIBVERSION) libroutino-slim.so ) + + ######## + +@@ -285,6 +291,8 @@ clean: clean-local + clean-local: + rm -f *~ + rm -f *.o ++ rm -f *.so ++ rm -f *.so.* + rm -f $(EXE) + rm -f $(LIB) + rm -f $(D) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/routino.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel