This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
gfs2-utils: master - askant: Fix linking with libgfs2
- From: Andrew Price <andyp at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 28 Jan 2009 09:17:30 +0000 (UTC)
- Subject: gfs2-utils: master - askant: Fix linking with libgfs2
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=0e82e7bde59e188f477aa4aa65d1c8dfd26b72ed
Commit: 0e82e7bde59e188f477aa4aa65d1c8dfd26b72ed
Parent: 444ddc9714656acff00a9a4100a20cd3d0414426
Author: Andrew Price <andy@andrewprice.me.uk>
AuthorDate: Tue Jan 27 22:45:29 2009 +0000
Committer: Andrew Price <andy@andrewprice.me.uk>
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 <andy@andrewprice.me.uk>
---
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'])