[routino] 01/05: Replace soname patch with upstream changes.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Sep 17 20:48:28 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository routino.
commit ff63ce0dfcfeb71b391aa9bccf1ae051211961ee
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Sep 16 23:32:17 2015 +0200
Replace soname patch with upstream changes.
---
debian/patches/hardening | 2 +-
...1801-Dont-create-the-.so-files-on-Windows.patch | 42 +++++++
...dd-a-SONAME-shared-library-version-number.patch | 123 +++++++++++++++++++++
debian/patches/rename_router | 18 +--
debian/patches/series | 3 +-
debian/patches/soname | 92 ---------------
6 files changed, 177 insertions(+), 103 deletions(-)
diff --git a/debian/patches/hardening b/debian/patches/hardening
index 015e900..22e716f 100644
--- a/debian/patches/hardening
+++ b/debian/patches/hardening
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/Makefile.conf
+++ b/Makefile.conf
-@@ -131,3 +131,8 @@ ifneq ($(HOST),MINGW)
+@@ -144,3 +144,8 @@ ifneq ($(HOST),MINGW)
# Required to compile on Linux without a warning about pread() and pwrite() functions.
CFLAGS+=-D_POSIX_C_SOURCE=200809L
endif
diff --git a/debian/patches/r1801-Dont-create-the-.so-files-on-Windows.patch b/debian/patches/r1801-Dont-create-the-.so-files-on-Windows.patch
new file mode 100644
index 0000000..eda0da9
--- /dev/null
+++ b/debian/patches/r1801-Dont-create-the-.so-files-on-Windows.patch
@@ -0,0 +1,42 @@
+Description: Don't create the *.so files on Windows.
+Author: Andrew M. Bishop <amb at gedanken.org.uk>
+Origin: http://www.routino.org/viewvc?view=revision&revision=1801
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -35,10 +35,10 @@ EXE=planetsplitter$(.EXE) planetsplitter
+ filedumperx$(.EXE) filedumper$(.EXE) filedumper-slim$(.EXE) \
+ router+lib$(.EXE) router+lib-slim$(.EXE)
+
++ifneq ($(HOST),MINGW)
+ LIB=libroutino.so libroutino-slim.so
+-
+-ifeq ($(HOST),MINGW)
+-LIB+=routino.dll routino-slim.dll
++else
++LIB =routino.dll routino-slim.dll
+ LIB+=routino.def routino-slim.def
+ LIB+=routino.lib routino-slim.lib
+ endif
+@@ -193,8 +193,8 @@ endif
+ libroutino.so : $(LIBROUTINO_OBJ)
+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
+
+-routino.dll : libroutino.so
+- cp $< $@
++libroutino.dll : $(LIBROUTINO_OBJ)
++ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
+
+ routino.def : routino-lib.o
+ dlltool -v --output-def $@ $<
+@@ -217,8 +217,8 @@ endif
+ libroutino-slim.so : $(LIBROUTINO_SLIM_OBJ)
+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
+
+-routino-slim.dll : libroutino-slim.so
+- cp $< $@
++libroutino-slim.dll : $(LIBROUTINO_SLIM_OBJ)
++ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
+
+ routino-slim.def : routino-slim-lib.o
+ dlltool -v --output-def $@ $<
diff --git a/debian/patches/r1803-Add-a-SONAME-shared-library-version-number.patch b/debian/patches/r1803-Add-a-SONAME-shared-library-version-number.patch
new file mode 100644
index 0000000..f9c2920
--- /dev/null
+++ b/debian/patches/r1803-Add-a-SONAME-shared-library-version-number.patch
@@ -0,0 +1,123 @@
+Description: Add a "SONAME" shared library version number.
+Author: Andrew M. Bishop <amb at gedanken.org.uk>
+Origin: http://www.routino.org/viewvc?view=revision&revision=1803
+
+--- a/Makefile.conf
++++ b/Makefile.conf
+@@ -61,6 +61,13 @@ datadir=$(prefix)/xml
+ endif
+
+
++# Library version for ABI compatibility
++SOVERSION=0
++
++# Full library version (SOVERSION.MINOR[.RELEASE])
++LIBVERSION=$(SOVERSION).0.0
++
++
+ # Compilation programs
+ CC=gcc
+ LD=gcc
+@@ -97,6 +104,12 @@ CFLAGS_LIB+=-fPIC
+ LDFLAGS_LIB+=-fPIC
+ endif
+
++ifeq ($(HOST),UNIX)
++# Extra flags for compiling libroutino shared library (SONAME)
++LDFLAGS_SONAME=-Wl,-soname=libroutino.so.$(SOVERSION)
++LDFLAGS_SLIM_SONAME=-Wl,-soname=libroutino-slim.so.$(SOVERSION)
++endif
++
+ # Put the current directory in the shared library path for the router using libroutino
+ LDFLAGS_LDSO=-Wl,-R.
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -36,7 +36,9 @@ EXE=planetsplitter$(.EXE) planetsplitter
+ router+lib$(.EXE) router+lib-slim$(.EXE)
+
+ ifneq ($(HOST),MINGW)
+-LIB=libroutino.so libroutino-slim.so
++LIB =libroutino.so libroutino-slim.so
++LIB+=libroutino.so.$(SOVERSION) libroutino-slim.so.$(SOVERSION)
++LIB+=libroutino.so.$(LIBVERSION) libroutino-slim.so.$(LIBVERSION)
+ else
+ LIB =routino.dll routino-slim.dll
+ LIB+=routino.def routino-slim.def
+@@ -45,6 +47,14 @@ endif
+
+ INC=routino.h
+
++ifneq ($(HOST),MINGW)
++LINK_LIB=libroutino.so
++LINK_SLIM_LIB=libroutino-slim.so
++else
++LINK_LIB=routino.dll
++LINK_SLIM_LIB=routino-slim.dll
++endif
++
+ ########
+
+ all: all-local
+@@ -172,10 +182,10 @@ filedumper-slim$(.EXE) : $(FILEDUMPER_SL
+
+ ROUTER_LIB_OBJ=router+lib.o
+
+-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) libroutino.so
++router+lib$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_LIB)
+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
+
+-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) libroutino-slim.so
++router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_SLIM_LIB)
+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
+
+ ########
+@@ -190,10 +200,16 @@ 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) $(LDFLAGS_SONAME)
+
+-libroutino.dll : $(LIBROUTINO_OBJ)
++libroutino.so.$(SOVERSION) : libroutino.so.$(LIBVERSION)
++ ln -sf $< $@
++
++libroutino.so : libroutino.so.$(LIBVERSION)
++ ln -sf $< $@
++
++routino.dll : $(LIBROUTINO_OBJ)
+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
+
+ routino.def : routino-lib.o
+@@ -214,10 +230,16 @@ 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) $(LDFLAGS_SLIM_SONAME)
++
++libroutino-slim.so.$(SOVERSION) : libroutino-slim.so.$(LIBVERSION)
++ ln -sf $< $@
++
++libroutino-slim.so : libroutino-slim.so.$(LIBVERSION)
++ ln -sf $< $@
+
+-libroutino-slim.dll : $(LIBROUTINO_SLIM_OBJ)
++routino-slim.dll : $(LIBROUTINO_SLIM_OBJ)
+ $(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LIB)
+
+ routino-slim.def : routino-slim-lib.o
+@@ -271,7 +293,7 @@ install-local: all-local
+ @for file in $(LIB); do \
+ if [ -f $$file ]; then \
+ echo cp $$file $(DESTDIR)$(libdir) ;\
+- cp -f $$file $(DESTDIR)$(libdir) ;\
++ cp -df $$file $(DESTDIR)$(libdir) ;\
+ fi ;\
+ done
+
diff --git a/debian/patches/rename_router b/debian/patches/rename_router
index 9b0f53f..41ec79b 100644
--- a/debian/patches/rename_router
+++ b/debian/patches/rename_router
@@ -14,9 +14,9 @@ Forwarded: not-needed
- router+lib$(.EXE) router+lib-slim$(.EXE)
+ routino-router+lib$(.EXE) routino-router+lib-slim$(.EXE)
- LIB=libroutino.so libroutino-slim.so
-
-@@ -100,7 +100,7 @@ ifeq ($(HOST),MINGW)
+ ifneq ($(HOST),MINGW)
+ LIB =libroutino.so libroutino-slim.so
+@@ -110,7 +110,7 @@ ifeq ($(HOST),MINGW)
ROUTER_OBJ+=mman-win32.o
endif
@@ -25,7 +25,7 @@ Forwarded: not-needed
$(LD) $^ -o $@ $(LDFLAGS)
########
-@@ -115,7 +115,7 @@ ifeq ($(HOST),MINGW)
+@@ -125,7 +125,7 @@ ifeq ($(HOST),MINGW)
ROUTER_SLIM_OBJ+=mman-win32.o
endif
@@ -34,16 +34,16 @@ Forwarded: not-needed
$(LD) $^ -o $@ $(LDFLAGS)
########
-@@ -172,10 +172,10 @@ filedumper-slim$(.EXE) : $(FILEDUMPER_SL
+@@ -182,10 +182,10 @@ filedumper-slim$(.EXE) : $(FILEDUMPER_SL
ROUTER_LIB_OBJ=router+lib.o
--router+lib$(.EXE) : $(ROUTER_LIB_OBJ) libroutino.so
-+routino-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) libroutino.so
+-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_LIB)
++routino-router+lib$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_LIB)
$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
--router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) libroutino-slim.so
-+routino-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) libroutino-slim.so
+-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_SLIM_LIB)
++routino-router+lib-slim$(.EXE) : $(ROUTER_LIB_OBJ) $(LINK_SLIM_LIB)
$(LD) $^ -o $@ $(LDFLAGS) $(LDFLAGS_LDSO)
########
diff --git a/debian/patches/series b/debian/patches/series
index 0d226a9..6b18bf9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,8 @@
+r1801-Dont-create-the-.so-files-on-Windows.patch
+r1803-Add-a-SONAME-shared-library-version-number.patch
install_path
rename_router
#web_path
maploader
mapprops
hardening
-soname
diff --git a/debian/patches/soname b/debian/patches/soname
deleted file mode 100644
index eae751e..0000000
--- a/debian/patches/soname
+++ /dev/null
@@ -1,92 +0,0 @@
-Description: Add SONAME for libroutino{,-slim}.
-Author: Bas Couwenberg <sebastic at 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.so.$(LIBVERSION) libroutino.so )
-+ ( cd $(DESTDIR)$(libdir) && ln -s libroutino-slim.so.$(LIBVERSION) libroutino-slim.so.$(SOVERSION) && ln -s libroutino-slim.so.$(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
More information about the Pkg-grass-devel
mailing list