From patchwork Sat Oct 4 09:10:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Engelhardt X-Patchwork-Id: 396504 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ganesha.gnumonks.org (ganesha.gnumonks.org [IPv6:2001:780:45:1d:225:90ff:fe52:c662]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E5F88140129 for ; Sat, 4 Oct 2014 19:12:29 +1000 (EST) Received: from localhost ([127.0.0.1] helo=ganesha.gnumonks.org) by ganesha.gnumonks.org with esmtp (Exim 4.72) (envelope-from ) id 1XaLNw-0007nv-BO; Sat, 04 Oct 2014 11:12:16 +0200 Received: from ares08.inai.de ([2a01:4f8:141:6ffe::1]) by ganesha.gnumonks.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1XaLMB-0007lW-HH for openbsc@lists.osmocom.org; Sat, 04 Oct 2014 11:10:30 +0200 Received: by ares08.inai.de (Postfix, from userid 25121) id 318EF105389A0; Sat, 4 Oct 2014 11:10:27 +0200 (CEST) From: Jan Engelhardt To: holger@freyther.de Subject: [PATCH 2/5] build: resolve link failure in libosmogsm when --disable-talloc is used Date: Sat, 4 Oct 2014 11:10:22 +0200 Message-Id: <1412413825-24016-3-git-send-email-jengelh@inai.de> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1412413825-24016-1-git-send-email-jengelh@inai.de> References: <1412413825-24016-1-git-send-email-jengelh@inai.de> X-Spam-Score: 0.1 (/) X-Spam-Report: SpamASsassin versoin 3.3.1 on ganesha.gnumonks.org summary: Content analysis details: (0.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.1 TW_FC BODY: Odd Letter Triples with FC Cc: openbsc@lists.osmocom.org X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Development of the OpenBSC GSM base station controller List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openbsc-bounces@lists.osmocom.org Errors-To: openbsc-bounces@lists.osmocom.org 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