From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30959 invoked by alias); 11 Jun 2009 09:05:14 -0000 Received: (qmail 30953 invoked by alias); 11 Jun 2009 09:05:14 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 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 bastion2.fedora.phx.redhat.com Subject: gfs1-utils: master - build: drop dependency on libvolume_id To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs1-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7cfafe26d0ca3f092bcbaad1d2a7cb8ac1acca23 X-Git-Newrev: 41d73ce1e18ea69ff12be6529fba64806e41b892 From: "Fabio M. Di Nitto" Message-Id: <20090611090446.ABB2B120360@lists.fedorahosted.org> Date: Thu, 11 Jun 2009 09:05: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-q2/txt/msg00499.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs1-utils.git?p=gfs1-utils.git;a=commitdiff;h=41d73ce1e18ea69ff12be6529fba64806e41b892 Commit: 41d73ce1e18ea69ff12be6529fba64806e41b892 Parent: 7cfafe26d0ca3f092bcbaad1d2a7cb8ac1acca23 Author: Fabio M. Di Nitto AuthorDate: Thu Jun 11 11:04:22 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Thu Jun 11 11:04:22 2009 +0200 build: drop dependency on libvolume_id Signed-off-by: Fabio M. Di Nitto --- configure | 14 -------------- gfs/gfs_mkfs/Makefile | 3 +-- make/defines.mk.input | 2 -- 3 files changed, 1 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 6f4ca80..1c0056f 100755 --- a/configure +++ b/configure @@ -33,8 +33,6 @@ my %options = ( gfskincdir => \$gfskincdir, incdir => \$incdir, libdir => \$libdir, - volidincdir => \$volidincdir, - volidlibdir => \$volidlibdir, mandir => \$mandir, prefix => \$prefix, sbindir => \$sbindir, @@ -67,8 +65,6 @@ my $err = &GetOptions (\%options, 'gfskincdir=s', 'incdir=s', 'libdir=s', - 'volidincdir=s', - 'volidlibdir=s', 'mandir=s', 'prefix=s', 'sbindir=s', @@ -116,8 +112,6 @@ if ($help || !$err) { print "--kernel_build=\tthe directory containing the kernel object tree you wish to\n\t\tcompile against. (Default: /lib/modules/`uname -r`/build\n\t\tif available or /usr/src/linux as fallback)\n"; print "--kernel_src=\tthe directory containing the kernel source you wish to\n\t\tcompile against. (Default: /lib/modules/`uname -r`/source\n\t\tif available or \$kernel_build as fallback)\n"; print "--incdir=\tthe base directory for include files. (Default: {prefix}/include)\n"; - print "--volidincdir=\tthe base directory for volume_id include files. (Default: {incdir})\n"; - print "--volidlibdir=\tthe base directory for volume_id libraries. (Default: {libdir})\n"; print "--enable_contrib\tEnable build of community contributed code/tools. (Default: no)\n"; print "--enable_legacy_code\tEnable build of old/obsolete/unsupported code/tools. (Default: no)\n"; print "--without_gfs\tDisable gfs building (Default: enabled)\n"; @@ -275,12 +269,6 @@ if (!$incdir) { if (!$libdir) { $libdir="${prefix}/lib"; } -if (!$volidincdir) { - $volidincdir="${incdir}"; -} -if (!$volidlibdir) { - $volidlibdir="${libdir}"; -} if (!$mandir) { $mandir="${prefix}/share/man"; } @@ -356,8 +344,6 @@ while () { $_ =~ s/\@GFSKINCDIR\@/$gfskincdir/; $_ =~ s/\@INCDIR\@/$incdir/; $_ =~ s/\@LIBDIR\@/$libdir/; - $_ =~ s/\@VOLIDINCDIR\@/$volidincdir/; - $_ =~ s/\@VOLIDLIBDIR\@/$volidlibdir/; $_ =~ s/\@MANDIR\@/$mandir/; $_ =~ s/\@SBINDIR\@/$sbindir/; $_ =~ s/\@INITDDIR\@/$initddir/; diff --git a/gfs/gfs_mkfs/Makefile b/gfs/gfs_mkfs/Makefile index 165644b..f963a59 100644 --- a/gfs/gfs_mkfs/Makefile +++ b/gfs/gfs_mkfs/Makefile @@ -18,11 +18,10 @@ OBJS= device_geometry.o \ structures.o CFLAGS += -DHELPER_PROGRAM -D_FILE_OFFSET_BITS=64 -CFLAGS += -I${gfskincdir} -I${volidincdir} +CFLAGS += -I${gfskincdir} CFLAGS += -I$(S)/../include -I$(S)/../libgfs CFLAGS += -I${incdir} -LDFLAGS += -L${volidlibdir} -lvolume_id LDFLAGS += -L../libgfs -lgfs LDFLAGS += -L${libdir} diff --git a/make/defines.mk.input b/make/defines.mk.input index 0775137..8424bb9 100644 --- a/make/defines.mk.input +++ b/make/defines.mk.input @@ -23,8 +23,6 @@ OBJDIR = @OBJDIR@ KERNEL_BUILD = @KERNEL_BUILD@ KERNEL_SRC = @KERNEL_SRC@ gfskincdir ?= @GFSKINCDIR@ -volidincdir ?= @VOLIDINCDIR@ -volidlibdir ?= @VOLIDLIBDIR@ experimental_build ?= @ENABLE_CRACK_OF_THE_DAY@ legacy_code ?= @ENABLE_LEGACY_CODE@ contrib_code ?= @ENABLE_CONTRIB@