File 0001-build-fixes.patch of Package libosmo-sccp

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-build-fixes.patch of Package libosmo-sccp (Revision 4feb780ef33ff1bfa291e36a2af9d061)

Currently displaying revision 4feb780ef33ff1bfa291e36a2af9d061 , Show latest

From f34a36b94185f377639c7c997dcdd2453fc23574 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 21 Jul 2014 10:13:00 +0200
Subject: [PATCH] build: fixes

Find and use system talloc, do not rely on OSMO's bundled copy.

Avoid adding .o files into _LDADD, this is nonportable.

Rename libmtp to libosmo-mtp, as libmtp is already used by the
Multimedia Transfer Protocol library.
---
 configure.ac           |    1 +
 libosmo-mtp.pc.in      |    2 +-
 libosmo-sccp.pc.in     |    2 +-
 src/Makefile.am        |   20 +++++++++++++++-----
 tests/m2ua/Makefile.am |    2 +-
 tests/sccp/Makefile.am |    6 +++---
 tests/ss7/Makefile.am  |    2 --
 tests/xua/Makefile.am  |    6 ++----
 8 files changed, 24 insertions(+), 17 deletions(-)

Index: libosmo-sccp-1.6.0/configure.ac
===================================================================
--- libosmo-sccp-1.6.0.orig/configure.ac
+++ libosmo-sccp-1.6.0/configure.ac
@@ -36,6 +36,7 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"
 fi
 PKG_PROG_PKG_CONFIG([0.20])
 
+PKG_CHECK_MODULES([TALLOC], [talloc])
 PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0)
 PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.7.0)
 PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0)
Index: libosmo-sccp-1.6.0/libosmo-mtp.pc.in
===================================================================
--- libosmo-sccp-1.6.0.orig/libosmo-mtp.pc.in
+++ libosmo-sccp-1.6.0/libosmo-mtp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: Osmo MTP Lib
 Description: Osmo MTP Lib
 Version: @VERSION@
-Libs: -L${libdir} -lmtp
+Libs: -L${libdir} -losmo-mtp
 Cflags: -I${includedir}/
Index: libosmo-sccp-1.6.0/libosmo-sccp.pc.in
===================================================================
--- libosmo-sccp-1.6.0.orig/libosmo-sccp.pc.in
+++ libosmo-sccp-1.6.0/libosmo-sccp.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: OpenBSC SCCP Lib
 Description: OpenBSC SCCP Lib
 Version: @VERSION@
-Libs: -L${libdir} -lsccp
+Libs: -L${libdir} -losmo-sccp
 Cflags: -I${includedir}/
Index: libosmo-sccp-1.6.0/src/Makefile.am
===================================================================
--- libosmo-sccp-1.6.0.orig/src/Makefile.am
+++ libosmo-sccp-1.6.0/src/Makefile.am
@@ -7,15 +7,21 @@ noinst_HEADERS = sccp_internal.h ss7_int
 # Legacy static libs
 
 sccpdir = $(libdir)
-sccp_LIBRARIES = libsccp.a libmtp.a libxua.a
+sccp_LTLIBRARIES = libosmo-sccp.la libosmo-mtp.la libosmo-xua.la
 
-libsccp_a_SOURCES = sccp.c
-libmtp_a_SOURCES = mtp_pcap.c
-libxua_a_SOURCES = xua_msg.c
+libosmo_sccp_la_SOURCES = sccp.c
+libosmo_mtp_la_SOURCES = mtp_pcap.c
+libosmo_xua_la_SOURCES = xua_msg.c
 # ensure that the file for the static lib is built with different C
 # flags, working around automake complaining that xua_msg.o is built
 # both with libtool (below) and without (here)
-libxua_a_CPPFLAGS = $(AM_CPPFLAGS) -DDUMMY -UDUMMY
+libosmo_xua_la_CPPFLAGS = ${AM_CPPFLAGS} -DDUMMY -UDUMMY
+
+libosmo_sccp_la_LIBADD = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS)
+libosmo_sccp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_mtp_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libosmo_xua_la_LIBADD = $(TALLOC_LIBS) $(LIBOSMOCORE_LIBS)
+libosmo_xua_la_LDFLAGS = -release ${PACKAGE_VERSION}
 
 
 # New shared lib
@@ -36,3 +42,7 @@ libosmo_sigtran_la_SOURCES = sccp_sap.c
 libosmo_sigtran_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined -export-symbols-regex '^osmo_'
 libosmo_sigtran_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) \
 			    $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
+
+noinst_LTLIBRARIES = libosmo-sigtran-internal.la
+libosmo_sigtran_internal_la_SOURCES = $(libosmo_sigtran_la_SOURCES)
+libosmo_sigtran_internal_la_LIBADD = $(libosmo_sigtran_la_LIBADD)
Index: libosmo-sccp-1.6.0/tests/m2ua/Makefile.am
===================================================================
--- libosmo-sccp-1.6.0.orig/tests/m2ua/Makefile.am
+++ libosmo-sccp-1.6.0/tests/m2ua/Makefile.am
@@ -5,4 +5,4 @@ EXTRA_DIST = m2ua_test.ok
 
 check_PROGRAMS = m2ua_test
 m2ua_test_SOURCES = m2ua_test.c
-m2ua_test_LDADD = $(top_builddir)/src/libxua.a $(LIBOSMOCORE_LIBS)
+m2ua_test_LDADD = $(top_builddir)/src/libosmo-xua.la $(LIBOSMOCORE_LIBS) ${TALLOC_LIBS}
Index: libosmo-sccp-1.6.0/tests/sccp/Makefile.am
===================================================================
--- libosmo-sccp-1.6.0.orig/tests/sccp/Makefile.am
+++ libosmo-sccp-1.6.0/tests/sccp/Makefile.am
@@ -1,13 +1,13 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS}
 AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
 
 EXTRA_DIST = sccp_test.ok
 
 check_PROGRAMS = sccp_test
 
-sccp_test_SOURCES = sccp_test.c
+sccp_test_SOURCES = sccp_test.c ${top_srcdir}/src/sccp.c
 sccp_test_LDADD = \
 	$(LIBOSMOCORE_LIBS) \
-	$(top_builddir)/src/sccp.o \
+	${TALLOC_LIBS} \
 	$(NULL)
 
Index: libosmo-sccp-1.6.0/tests/ss7/Makefile.am
===================================================================
--- libosmo-sccp-1.6.0.orig/tests/ss7/Makefile.am
+++ libosmo-sccp-1.6.0/tests/ss7/Makefile.am
@@ -1,7 +1,5 @@
 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall
 AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-
-AM_LDFLAGS = -static
 LDADD = $(top_builddir)/src/libosmo-sigtran.la \
 	$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
 
Index: libosmo-sccp-1.6.0/tests/xua/Makefile.am
===================================================================
--- libosmo-sccp-1.6.0.orig/tests/xua/Makefile.am
+++ libosmo-sccp-1.6.0/tests/xua/Makefile.am
@@ -1,8 +1,6 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMONETIF_CFLAGS) $(LIBSCTP_CFLAGS)
 AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS)
-
-AM_LDFLAGS = -static
-LDADD = $(top_builddir)/src/libosmo-sigtran.la \
+LDADD = $(top_builddir)/src/libosmo-xua.la $(top_builddir)/src/libosmo-sigtran-internal.la \
 	$(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMONETIF_LIBS) $(LIBSCTP_LIBS)
 
 EXTRA_DIST = xua_test.ok xua_test.err

Places

File 0001-build-fixes.patch of Package libosmo-sccp (Revision 4feb780ef33ff1bfa291e36a2af9d061)

Places