[Pkg-voip-commits] r5301 - in /ser/trunk/debian: changelog patches/ patches/dont-link-superfluous-libs patches/series

Sun Mar 16 15:34:43 UTC 2008

Author: marcusb-guest
Date: Sun Mar 16 15:34:43 2008
New Revision: 5301

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5301
Log:
Do not link with unneeded shared libs.

Added:
    ser/trunk/debian/patches/
    ser/trunk/debian/patches/dont-link-superfluous-libs
    ser/trunk/debian/patches/series
Modified:
    ser/trunk/debian/changelog

Modified: ser/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/changelog?rev=5301&op=diff
==============================================================================

--- ser/trunk/debian/changelog (original)
+++ ser/trunk/debian/changelog Sun Mar 16 15:34:43 2008
@@ -10,6 +10,8 @@
   * Merge the acc_db module into the main ser package, and the acc_radius
     module into the ser-radius-modules package, since they have no extra
     dependencies.
+  * New patch dont-link-superfluous-libs: Avoid unnecessary linking of
+    shared libraries.
   * Bump compat version to 5.
 
  -- Marcus Better <marcus at better.se>  Thu, 13 Mar 2008 19:50:19 +0000

Added: ser/trunk/debian/patches/dont-link-superfluous-libs
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/patches/dont-link-superfluous-libs?rev=5301&op=file
==============================================================================
--- ser/trunk/debian/patches/dont-link-superfluous-libs (added)
+++ ser/trunk/debian/patches/dont-link-superfluous-libs Sun Mar 16 15:34:43 2008
@@ -1,0 +1,94 @@
+The sercmd utility and some of the modules were being linked against
+some unneeded shared libraries.
+
+--- a/modules/dialog/Makefile
++++ b/modules/dialog/Makefile
+@@ -12,7 +12,6 @@ NAME = dialog.so
+ # and root ser directory must be in include directories
+ 
+ DEFS += -Wall -I../../lib -DSER -I../..
+-LIBS += -L../../lib/cds -l_ser_cds
+ 
+ #DEFS = -I../.. -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -Wall -I../../lib -DSER $(DEFS)
+ #LIBS = -L../../lib/cds -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 -lcurl -lcds $(LIBS)
+--- a/modules/mysql/Makefile
++++ b/modules/mysql/Makefile
+@@ -17,6 +17,6 @@ LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib
+ 		-L$(LOCALBASE)/mysql/lib/mysql/ \
+ 		-L$(LOCALBASE)/mysql/lib \
+ 		-L/usr/lib64/mysql \
+-		-lmysqlclient -lz
++		-lmysqlclient
+ 
+ include ../../Makefile.modules
+--- a/modules/pa/Makefile
++++ b/modules/pa/Makefile
+@@ -16,6 +16,6 @@ LIBS=
+ # experimental (vku)
+ DEFS += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include -Wall -I../../lib -DSER -I../..
+ # LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -L../../lib/xcap -L../../lib/presence -L../../lib/cds -lxcap -lpresence -lcds -lxml2 -lcurl 
+-LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -L../../lib/xcap -L../../lib/presence -L../../lib/cds -l_ser_xcap -l_ser_presence -l_ser_cds
++LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib
+ 
+ include ../../Makefile.modules
+--- a/modules/presence_b2b/Makefile
++++ b/modules/presence_b2b/Makefile
+@@ -24,7 +24,7 @@ NAME = presence_b2b.so
+ # and root ser directory must be in include directories
+ 
+ DEFS += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include -Wall -I../../lib -DSER -I../..
+-LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 -L../../lib/presence -L../../lib/cds -L../../lib/xcap -l_ser_xcap -l_ser_presence -l_ser_cds
++LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2
+ 
+ #DEFS = -I../.. -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -Wall -I../../lib -DSER $(DEFS)
+ #LIBS = -L../../lib/cds -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 -lcurl -lcds $(LIBS)
+--- a/modules/rls/Makefile
++++ b/modules/rls/Makefile
+@@ -24,7 +24,7 @@ NAME = rls.so
+ # and root ser directory must be in include directories
+ 
+ DEFS += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include -Wall -I../../lib -DSER -I../..
+-LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 -L../../lib/presence -L../../lib/cds -L../../lib/xcap -l_ser_xcap -l_ser_presence -l_ser_cds
++LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2
+ 
+ #DEFS = -I../.. -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -Wall -I../../lib -DSER $(DEFS)
+ #LIBS = -L../../lib/cds -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 -lcurl -lcds $(LIBS)
+--- a/modules/xcap/Makefile
++++ b/modules/xcap/Makefile
+@@ -24,7 +24,7 @@ NAME = xcap.so
+ # and root ser directory must be in include directories
+ 
+ DEFS += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include -Wall -I../../lib -DSER -I../..
+-LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 -lcurl -L../../lib/presence -L../../lib/cds -L../../lib/xcap -l_ser_xcap -l_ser_presence -l_ser_cds
++LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 -lcurl
+ 
+ #DEFS = -I../.. -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 -Wall -I../../lib -DSER $(DEFS)
+ #LIBS = -L../../lib/cds -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 -lcurl -lcds $(LIBS)
+--- a/utils/sercmd/Makefile
++++ b/utils/sercmd/Makefile
+@@ -12,7 +12,7 @@ use_readline ?=
+ 
+ DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \
+ 		$(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS))
+-LIBS:=$(filter-out -lfl  -ldl -lpthread -lssl -lcrypto, $(LIBS))
++LIBS:=$(filter-out -lfl  -ldl -lresolv -lpthread -lssl -lcrypto, $(LIBS))
+ 
+ ifeq ($(use_readline),)
+ readline_path := $(shell  \
+@@ -27,7 +27,7 @@ endif
+ 
+ ifeq ($(use_readline),1)
+ 	DEFS+=-DUSE_READLINE
+-	LIBS+=-lreadline -lncurses
++	LIBS+=-lreadline
+ endif
+ 
+ 
+--- a/Makefile.modules
++++ b/Makefile.modules
+@@ -43,3 +43,5 @@ LDFLAGS:=$(MOD_LDFLAGS)
+ endif
+ 
+ include $(COREPATH)/Makefile.rules
++
++LIBS:=$(filter-out -ldl -lresolv, $(LIBS))

Added: ser/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/patches/series?rev=5301&op=file
==============================================================================
--- ser/trunk/debian/patches/series (added)
+++ ser/trunk/debian/patches/series Sun Mar 16 15:34:43 2008
@@ -1,0 +1,1 @@
+dont-link-superfluous-libs


