2014-07-21 07:58:13 +00:00
|
|
|
From 69015be0dfe88476d80895aa3261ab64223c664c Mon Sep 17 00:00:00 2001
|
2013-02-22 08:03:03 +00:00
|
|
|
From: Jan Engelhardt <jengelh@inai.de>
|
|
|
|
|
Date: Sun, 17 Feb 2013 20:23:09 +0100
|
2014-07-21 07:58:13 +00:00
|
|
|
Subject: [PATCH 2/4] build: resolve link failure in libosmogsm when
|
2013-02-22 08:03:03 +00:00
|
|
|
--disable-talloc is used
|
|
|
|
|
|
|
|
|
|
The link stage fails at some point. libosmogsm.so:lapd-core.c uses
|
|
|
|
|
talloc_free, but does not link to libtalloc.so. Correct this.
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
---
|
2014-07-21 07:58:13 +00:00
|
|
|
src/gsm/Makefile.am | 3 +++
|
2013-02-22 08:03:03 +00:00
|
|
|
1 file changed, 3 insertions(+)
|
|
|
|
|
|
2014-07-21 07:58:13 +00:00
|
|
|
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
|
|
|
|
|
index 46698cd..c471b45 100644
|
|
|
|
|
--- a/src/gsm/Makefile.am
|
|
|
|
|
+++ b/src/gsm/Makefile.am
|
|
|
|
|
@@ -23,5 +23,8 @@ libosmogsm_la_SOURCES = a5.c rxlev_stat.c tlv_parser.c comp128.c comp128v23.c \
|
2013-02-22 08:03:03 +00:00
|
|
|
|
2013-06-02 23:26:53 +00:00
|
|
|
libosmogsm_la_LDFLAGS = $(LTLDFLAGS_OSMOGSM) -version-info $(LIBVERSION) -no-undefined
|
2013-02-22 08:03:03 +00:00
|
|
|
libosmogsm_la_LIBADD = $(top_builddir)/src/libosmocore.la
|
|
|
|
|
+if !ENABLE_TALLOC
|
|
|
|
|
+libosmogsm_la_LIBDADD = -ltalloc
|
|
|
|
|
+endif
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST = libosmogsm.map
|
2014-07-21 07:58:13 +00:00
|
|
|
--
|
|
|
|
|
2.0.0
|
|
|
|
|
|
