From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2456 invoked by alias); 19 Feb 2009 10:10:15 -0000 Received: (qmail 2424 invoked by alias); 19 Feb 2009 10:10:15 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - askant: Fix linking with libgfs2 To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 47f32bf33ad1f7981d34df8aeadc3abfdd0272be X-Git-Newrev: c8d278b7b6ba74d6bf491b7994ab4b25b5841207 From: "Fabio M. Di Nitto" Message-Id: <20090219100923.A721F12030E@lists.fedorahosted.org> Date: Thu, 19 Feb 2009 10:10:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00501.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c8d278b7b6ba74d6bf491b7994ab4b25b5841207 Commit: c8d278b7b6ba74d6bf491b7994ab4b25b5841207 Parent: 47f32bf33ad1f7981d34df8aeadc3abfdd0272be Author: Andrew Price AuthorDate: Tue Jan 27 22:45:29 2009 +0000 Committer: Fabio M. Di Nitto CommitterDate: Thu Feb 19 10:59:57 2009 +0100 askant: Fix linking with libgfs2 While -lgfs2 was being handled in the Makefile it was being added to the gcc commandline too early and libgfs2.a wasn't being linked in properly. This moves the handling of -lgfs2 back into setup.py so that it gets used in the correct place. Signed-off-by: Andrew Price --- contrib/askant/Makefile | 2 +- contrib/askant/setup.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/askant/Makefile b/contrib/askant/Makefile index 3773349..9ba53df 100644 --- a/contrib/askant/Makefile +++ b/contrib/askant/Makefile @@ -7,7 +7,7 @@ include $(OBJDIR)/make/clean.mk CFLAGS += -I$(SRCDIR)/gfs2/libgfs2 CFLAGS += -I$(SRCDIR)/gfs2/include -LDFLAGS += -L$(OBJDIR)/gfs2/libgfs2 -lgfs2 +LDFLAGS += -L$(OBJDIR)/gfs2/libgfs2 build: CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" python $(S)/setup.py build diff --git a/contrib/askant/setup.py b/contrib/askant/setup.py index 3c971bc..26c5ca1 100644 --- a/contrib/askant/setup.py +++ b/contrib/askant/setup.py @@ -11,5 +11,6 @@ setup(name="askant", url="http://andrewprice.me.uk/projects/askant", packages = ['askant','askant.fs'], ext_modules = [Extension("askant.fs.gfs2", - sources = ["fsplugins/gfs2/gfs2module.c","fsplugins/gfs2/gfs2.c"])], + sources = ["fsplugins/gfs2/gfs2module.c","fsplugins/gfs2/gfs2.c"], + libraries = ["gfs2"])], scripts = ['scripts/askant'])