From patchwork Mon Aug 4 09:58:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 34828 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f71.google.com (mail-oa0-f71.google.com [209.85.219.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C789221F5F for ; Mon, 4 Aug 2014 10:00:34 +0000 (UTC) Received: by mail-oa0-f71.google.com with SMTP id g18sf39237034oah.6 for ; Mon, 04 Aug 2014 03:00:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=2eWY0GUbiBrphCuz2+ytlVqoNhKSTKPorskVCC3Hy7I=; b=B/IpMMhbSAwcuEm+yqxs/20vS3UL/T5NpklyxtRGxoQmFapkANWK7AAo/bnkBWqIXC ELGQRmoHx6VcRHPSAFdTuXrYgoKXW3B9eQGdA9PLhmx3giIoYPXN6mmURUozFileRO8s NJPgasb1wXsFEE/Qz4E3WKIuK51KQfX2XyJ8/TSeCONT9LRgxPoaAVnxJmZmIUK1VFHP O2/pNyPQC64EdH20LvS79DT4hAeLzn44g14jWriW/8Kf3UUrKgwKnDaFHphmm0M1NwxW 9tV8y1OPZptViacGa0ucFwZMw4v33TxJcjctJSI3YcqE2upXpxS/HUJVeaPWFKthcg19 iPMw== X-Gm-Message-State: ALoCoQkQew6PpMZYqKdT6ISvqiDC1MFHgz0j/UcMX/bXNkvYPyjvDY3gQ4zijOqlnITChw8qXYCU X-Received: by 10.182.29.65 with SMTP id i1mr7872472obh.30.1407146432169; Mon, 04 Aug 2014 03:00:32 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.98.175 with SMTP id o44ls2067278qge.55.gmail; Mon, 04 Aug 2014 03:00:32 -0700 (PDT) X-Received: by 10.220.163.130 with SMTP id a2mr1909570vcy.52.1407146432017; Mon, 04 Aug 2014 03:00:32 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id u3si11610162vey.74.2014.08.04.03.00.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 03:00:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id le20so10517384vcb.0 for ; Mon, 04 Aug 2014 03:00:31 -0700 (PDT) X-Received: by 10.221.9.72 with SMTP id ov8mr22120096vcb.27.1407146431928; Mon, 04 Aug 2014 03:00:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp291932vcb; Mon, 4 Aug 2014 03:00:31 -0700 (PDT) X-Received: by 10.42.106.145 with SMTP id z17mr29196497ico.82.1407146431385; Mon, 04 Aug 2014 03:00:31 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id t6si39193634icp.106.2014.08.04.03.00.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 03:00:31 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEF2F-0002hA-DF; Mon, 04 Aug 2014 09:58:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEF2E-0002h5-G3 for xen-devel@lists.xen.org; Mon, 04 Aug 2014 09:58:30 +0000 Received: from [85.158.139.211:20708] by server-9.bemta-5.messagelabs.com id C3/EE-20744-5495FD35; Mon, 04 Aug 2014 09:58:29 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1407146307!11703630!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32691 invoked from network); 4 Aug 2014 09:58:29 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 4 Aug 2014 09:58:29 -0000 X-IronPort-AV: E=Sophos;i="5.01,797,1400025600"; d="scan'208";a="159047208" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Mon, 4 Aug 2014 05:58:26 -0400 Received: from cosworth.uk.xensource.com ([10.80.16.52] helo=localhost.localdomain ident=ianc) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XEF29-00050J-Ca; Mon, 04 Aug 2014 10:58:26 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Mon, 04 Aug 2014 10:58:25 +0100 From: Ian Campbell To: , Date: Mon, 4 Aug 2014 10:58:25 +0100 Message-ID: <321a64dc64db335460b51becfc040f4cb0e84a9e.1407146305.git.ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: Bastian Blank , Ian Campbell Subject: [Xen-devel] [PATCH] tools: libxl: link libxlu against libxl. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: It uses libxl_defbool_set and must therefore be linked against the right library. Spotted by dpkg-shlibdeps and pointed out by Bastian Blank: dpkg-shlibdeps: warning: symbol libxl_defbool_set used by debian/libxen-4.4/usr/lib/libxlutil-4.4.so found in none of the libraries This required switching the make rule from $^ to an explicit LIBXLU_OBJS since the former now includes libxenlight.so. Signed-off-by: Ian Campbell Cc: Bastian Blank --- tools/libxl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index bd0db3b..e61048d 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -35,7 +35,7 @@ LDFLAGS += $(PTHREAD_LDFLAGS) LIBXL_LIBS += $(PTHREAD_LIBS) LIBXL_LIBS += $(LIBXL_LIBS-y) -LIBXLU_LIBS = +LIBXLU_LIBS = libxenlight.so LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o flexarray.o ifeq ($(LIBXL_BLKTAP),y) @@ -213,8 +213,8 @@ libxlutil.so: libxlutil.so.$(XLUMAJOR) libxlutil.so.$(XLUMAJOR): libxlutil.so.$(XLUMAJOR).$(XLUMINOR) $(SYMLINK_SHLIB) $< $@ -libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXLU_LIBS) $(APPEND_LDFLAGS) +libxlutil.so.$(XLUMAJOR).$(XLUMINOR): $(LIBXLU_OBJS) libxenlight.so + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxlutil.so.$(XLUMAJOR) $(SHLIB_LDFLAGS) -o $@ $(LIBXLU_OBJS) $(LIBXLU_LIBS) $(APPEND_LDFLAGS) libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^