From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20816 invoked by alias); 28 Jan 2009 09:19:34 -0000 Received: (qmail 20810 invoked by alias); 28 Jan 2009 09:19:34 -0000 X-SWARE-Spam-Status: No, hits=-0.0 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Status: No, hits=-0.0 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: gfs2-utils: master - askant: Fix linking with libgfs2 To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs2-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 444ddc9714656acff00a9a4100a20cd3d0414426 X-Git-Newrev: 0e82e7bde59e188f477aa4aa65d1c8dfd26b72ed From: Andrew Price Message-Id: <20090128091730.41D9912055D@lists.fedorahosted.org> Date: Wed, 28 Jan 2009 09:19: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/msg00305.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=0e82e7bde59e188f477aa4aa65d1c8dfd26b72ed Commit: 0e82e7bde59e188f477aa4aa65d1c8dfd26b72ed Parent: 444ddc9714656acff00a9a4100a20cd3d0414426 Author: Andrew Price AuthorDate: Tue Jan 27 22:45:29 2009 +0000 Committer: Andrew Price CommitterDate: Tue Jan 27 23:16:44 2009 +0000 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'])