File osmo-talloc.diff of Package libosmocore

Overview Repositories Revisions Requests Users Attributes Meta

File osmo-talloc.diff of Package libosmocore (Revision 0b9ba5632bbb40622efb3157e9795977)

Currently displaying revision 0b9ba5632bbb40622efb3157e9795977 , Show latest

From c1d2d27e87686969b02f86475fe3fb4967ba5872 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 17 Feb 2013 20:23:09 +0100
Subject: [PATCH 1/3] build: resolve link failure in libosmogsm when
 --disable-talloc is used

libosmogsm.so:lapd-core.c uses talloc_free unconditionally (like
libosmocore), but in the absence of the builtin talloc, does not link
to libtalloc.so (like libosmocore would). This causes linker failures
when programs using libosmogsm are being built. Correct this issue.

CCLD     osmo-arfcn
	../src/gsm/.libs/libosmogsm.so: undefined reference to `talloc_free'
	collect2: error: ld returned 1 exit status
	make[2]: *** [osmo-arfcn] Error 1
---
 src/gsm/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
index 828aa50..b0cdea2 100644
--- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -24,5 +24,8 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \
 
 libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined
 libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la
+if !ENABLE_TALLOC
+libosmogsm_la_LIBADD += -ltalloc
+endif
 
 EXTRA_DIST = libosmogsm.map
-- 
2.0.0

Places

File osmo-talloc.diff of Package libosmocore (Revision 0b9ba5632bbb40622efb3157e9795977)

Places