Bug#297876: xfsprogs: FTBFS (amd64/gcc-4.0): static declaration of 'progname' follows non-static declaration

[Andreas Jochens]

Package: xfsprogs
Severity: normal
Tags: patch

When building 'xfsprogs' on amd64 with gcc-4.0,
I get the following error:

xfs_mkfile.c:42: error: static declaration of 'progname' follows non-static 
declaration
../include/xfs/libxfs.h:125: error: previous declaration of 'progname' was here
make[2]: *** [xfs_mkfile.o] Error 1

With the attached patch 'xfsprogs' can be compiled
on amd64 using gcc-4.0.

Regards
Andreas Jochens

diff -urN ../tmp-orig/xfsprogs-2.6.20/mkfile/xfs_mkfile.c ./mkfile/xfs_mkfile.c
--- ../tmp-orig/xfsprogs-2.6.20/mkfile/xfs_mkfile.c     2003-05-01 
08:00:53.000000000 +0200
+++ ./mkfile/xfs_mkfile.c       2005-03-03 11:31:00.117417829 +0100
@@ -39,13 +39,13 @@
 
 #define        MAXBUFFERSIZE   (256 * 1024)
 
-static char *progname;
+static char *progname_local;
 
 static void
 usage(void)
 {
        fprintf(stderr, _("%s: [-npv] <size> <name1> [<name2>] ...\n"),
-               progname);
+               progname_local);
        exit(2);
 }
 
@@ -63,7 +63,7 @@
        if (!platform_test_xfs_fd(fd)) {
                fprintf(stderr, _("%s: "
                        "file [\"%s\"] is not on an XFS filesystem\n"),
-                       progname, name);
+                       progname_local, name);
                return -1;
        }
        return fd;
@@ -93,7 +93,7 @@
        int oflags;
        xfs_flock64_t flck;
 
-       progname = basename(argv[0]);
+       progname_local = basename(argv[0]);
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
@@ -110,7 +110,7 @@
                                verbose++;
                                break;
                        case 'V':
-                               printf(_("%s version %s\n"), progname, VERSION);
+                               printf(_("%s version %s\n"), progname_local, 
VERSION);
                                exit(0);
                        default:
                                errflg++;
diff -urN ../tmp-orig/xfsprogs-2.6.20/debian/control ./debian/control
--- ../tmp-orig/xfsprogs-2.6.20/debian/control  2004-05-19 07:00:19.000000000 
+0200
+++ ./debian/control    2005-03-03 11:23:47.000000000 +0100
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Nathan Scott <[EMAIL PROTECTED]>
-Build-Depends: uuid-dev, autoconf, debhelper, gettext, libtool, 
libreadline4-dev
+Build-Depends: uuid-dev, autoconf, debhelper, gettext, libtool, 
libreadline5-dev
 Standards-Version: 3.5.9
 
 Package: xfsprogs


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]