public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
From: Andrew Price <andyp@fedoraproject.org>
To: cluster-cvs-relay@redhat.com
Subject: gfs2-utils: master - askant: Fix linking with libgfs2
Date: Wed, 28 Jan 2009 09:19:00 -0000	[thread overview]
Message-ID: <20090128091730.41D9912055D@lists.fedorahosted.org> (raw)

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']) 


                 reply	other threads:[~2009-01-28  9:19 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090128091730.41D9912055D@lists.fedorahosted.org \
    --to=andyp@fedoraproject.org \
    --cc=cluster-cvs-relay@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).