File osmo-talloc.diff of Package libosmo-netif

Overview Repositories Revisions Requests Users Attributes Meta

File osmo-talloc.diff of Package libosmo-netif (Revision ead693335db5cde1fb28fe96f62d2c60)

Currently displaying revision ead693335db5cde1fb28fe96f62d2c60 , Show latest

From 84cb7836dfb9cee206e7d2bd552d4a71fbea4aef Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Thu, 2 Oct 2014 23:26:16 +0200
Subject: [PATCH] build: support external libtalloc

---
 configure.ac         |    1 +
 examples/Makefile.am |   30 +++++++++++++++---------------
 src/Makefile.am      |    4 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)

Index: libosmo-netif-0.3.0/configure.ac
===================================================================
--- libosmo-netif-0.3.0.orig/configure.ac
+++ libosmo-netif-0.3.0/configure.ac
@@ -98,6 +98,7 @@ AC_SEARCH_LIBS([sctp_send], [sctp], [
 	AC_MSG_ERROR([sctp_send not found in searched libs])])
 LIBS=$old_LIBS
 
+PKG_CHECK_MODULES([TALLOC], [talloc])
 AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built))
 
 found_pcap=yes
Index: libosmo-netif-0.3.0/examples/Makefile.am
===================================================================
--- libosmo-netif-0.3.0.orig/examples/Makefile.am
+++ libosmo-netif-0.3.0/examples/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
+AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS)
 AM_LDFLAGS = $(COVERAGE_LDFLAGS)
 
 noinst_PROGRAMS = ipa-stream-client		\
@@ -21,54 +21,54 @@ noinst_HEADERS = udp-test.h
 
 ipa_stream_client_SOURCES = ipa-stream-client.c
 ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \
-			  $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+			  $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
 
 ipa_stream_server_SOURCES = ipa-stream-server.c
 ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \
-			  $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+			  $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
 
 lapd_over_datagram_user_SOURCES = lapd-over-datagram-user.c
 lapd_over_datagram_user_LDADD = $(top_builddir)/src/libosmonetif.la \
 				  $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
-				  $(LIBOSMOABIS_LIBS)
+				  $(LIBOSMOABIS_LIBS) $(TALLOC_LIBS)
 
 lapd_over_datagram_network_SOURCES = lapd-over-datagram-network.c
 lapd_over_datagram_network_LDADD = $(top_builddir)/src/libosmonetif.la \
 				  $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \
-				  $(LIBOSMOABIS_LIBS)
+				  $(LIBOSMOABIS_LIBS) $(TALLOC_LIBS)
 
 stream_client_SOURCES = stream-client.c
 stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \
-		      $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+		      $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
 
 stream_server_SOURCES = stream-server.c
 stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \
-		      $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+		      $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
 
 rs232_read_SOURCES = rs232-read.c
-rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS)
+rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(TALLOC_LIBS)
 
 rs232_write_SOURCES = rs232-write.c
-rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS)
+rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(TALLOC_LIBS)
 
 rtp_udp_test_client_SOURCES = rtp-udp-test-client.c
 rtp_udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la \
-			    $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+			    $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
 
 rtp_udp_test_server_SOURCES = rtp-udp-test-server.c
 rtp_udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la \
-			    $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+			    $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
 
 udp_test_client_SOURCES = udp-test-client.c
-udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
 
 udp_test_server_SOURCES = udp-test-server.c
-udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
 
 osmux_test_input_SOURCES = osmux-test-input.c
 osmux_test_input_LDADD = $(top_builddir)/src/libosmonetif.la \
-			 $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+			 $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
 
 osmux_test_output_SOURCES = osmux-test-output.c
 osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \
-			  $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)
+			  $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS)
Index: libosmo-netif-0.3.0/src/Makefile.am
===================================================================
--- libosmo-netif-0.3.0.orig/src/Makefile.am
+++ libosmo-netif-0.3.0/src/Makefile.am
@@ -3,12 +3,12 @@
 LIBVERSION=6:0:0
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)
-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS)
+AM_CFLAGS = -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS) $(TALLOC_CFLAGS)
 AM_LDFLAGS = $(COVERAGE_LDFLAGS)
 
 lib_LTLIBRARIES = libosmonetif.la
 
-libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS)
+libosmonetif_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBSCTP_LIBS) $(TALLOC_LIBS)
 libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
 
 libosmonetif_la_SOURCES = amr.c			\

Places

File osmo-talloc.diff of Package libosmo-netif (Revision ead693335db5cde1fb28fe96f62d2c60)

Places