Bug#294474: marked as done (busybox: FTBFS (amd64/gcc-4.0): conflicting types for 'build_bl_tree')
Your message dated Sun, 31 Jul 2005 04:32:05 -0700
with message-id <E1DzC33-000316-00@spohr.debian.org>
and subject line Bug#294474: fixed in busybox 1:1.00-4
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 9 Feb 2005 21:33:18 +0000
>From aj@andaco.de Wed Feb 09 13:33:18 2005
Return-path: <aj@andaco.de>
Received: from c129064.adsl.hansenet.de (localhost.localdomain) [213.39.129.64]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1CyzSX-0007gk-00; Wed, 09 Feb 2005 13:33:17 -0800
Received: from aj by localhost.localdomain with local (Exim 4.34)
id 1CyzST-0006XP-1Q; Wed, 09 Feb 2005 22:33:13 +0100
To: Debian Bug Tracking System <submit@bugs.debian.org>
From: Andreas Jochens <aj@andaco.de>
Subject: busybox: FTBFS (amd64/gcc-4.0): conflicting types for 'build_bl_tree'
Message-Id: <E1CyzST-0006XP-1Q@localhost.localdomain>
Date: Wed, 09 Feb 2005 22:33:13 +0100
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2005_01_02
X-Spam-Level:
Package: busybox
Severity: normal
Tags: patch
When building 'busybox' on amd64 with gcc-4.0,
I get the following error:
gcc -Wall -Wshadow -Os -fomit-frame-pointer -D_GNU_SOURCE -DBB_VER='"0.60.5"' -DBB_BT='"2005.02.09-21:18+0000"' -I- -I. -I../../ -c ../../gzip.c -o gzip.o
cc1: note: obsolete option -I- used, please use -iquote instead
../../gzip.c:2177: warning: type qualifiers ignored on function return type
../../gzip.c:2177: error: conflicting types for 'build_bl_tree'
../../gzip.c:1651: error: previous declaration of 'build_bl_tree' was here
make[1]: *** [gzip.o] Error 1
make[1]: Leaving directory `/busybox-0.60.5/debian/busybox_builddir'
make: *** [debian/build-stamp-busybox] Error 2
With the attached patch 'busybox' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/busybox-0.60.5/gzip.c ./gzip.c
--- ../tmp-orig/busybox-0.60.5/gzip.c 2002-02-28 03:54:37.000000000 +0000
+++ ./gzip.c 2005-02-09 20:51:48.240258773 +0000
@@ -2173,7 +2173,7 @@
* Construct the Huffman tree for the bit lengths and return the index in
* bl_order of the last bit length code to send.
*/
-static const int build_bl_tree()
+static int build_bl_tree()
{
int max_blindex; /* index of last bit length code of non zero freq */
diff -urN ../tmp-orig/busybox-0.60.5/mkfs_minix.c ./mkfs_minix.c
--- ../tmp-orig/busybox-0.60.5/mkfs_minix.c 2001-08-29 19:02:26.000000000 +0000
+++ ./mkfs_minix.c 2005-02-09 21:09:45.602797493 +0000
@@ -541,9 +541,8 @@
memset(super_block_buffer, 0, BLOCK_SIZE);
memset(boot_block_buffer, 0, 512);
MAGIC = magic;
- ZONESIZE = 0;
- MAXSIZE = version2 ? 0x7fffffff : (7 + 512 + 512 * 512) * 1024;
- ZONES = BLOCKS;
+ Super.s_log_zone_size = 0;
+ Super.s_max_size = version2 ? 0x7fffffff : (7 + 512 + 512 * 512) * 1024;
/* some magic nrs: 1 inode / 3 blocks */
if (req_nr_inodes == 0)
inodes = BLOCKS / 3;
@@ -551,23 +550,27 @@
inodes = req_nr_inodes;
/* Round up inode count to fill block size */
#ifdef BB_FEATURE_MINIX2
- if (version2)
+ if (version2) {
+ Super.s_zones = BLOCKS;
inodes = ((inodes + MINIX2_INODES_PER_BLOCK - 1) &
~(MINIX2_INODES_PER_BLOCK - 1));
- else
+ } else
#endif
+ {
+ Super.s_nzones = BLOCKS;
inodes = ((inodes + MINIX_INODES_PER_BLOCK - 1) &
~(MINIX_INODES_PER_BLOCK - 1));
+ }
if (inodes > 65535)
inodes = 65535;
- INODES = inodes;
- IMAPS = UPPER(INODES + 1, BITS_PER_BLOCK);
- ZMAPS = 0;
+ Super.s_ninodes = inodes;
+ Super.s_imap_blocks = UPPER(INODES + 1, BITS_PER_BLOCK);
+ Super.s_zmap_blocks = 0;
i = 0;
while (ZMAPS !=
UPPER(BLOCKS - (2 + IMAPS + ZMAPS + INODE_BLOCKS) + 1,
BITS_PER_BLOCK) && i < 1000) {
- ZMAPS =
+ Super.s_zmap_blocks =
UPPER(BLOCKS - (2 + IMAPS + ZMAPS + INODE_BLOCKS) + 1,
BITS_PER_BLOCK);
i++;
@@ -581,7 +584,7 @@
if (i >= 999) {
error_msg_and_die("unable to allocate buffers for maps");
}
- FIRSTZONE = NORM_FIRSTZONE;
+ Super.s_firstdatazone = NORM_FIRSTZONE;
inode_map = xmalloc(IMAPS * BLOCK_SIZE);
zone_map = xmalloc(ZMAPS * BLOCK_SIZE);
memset(inode_map, 0xff, IMAPS * BLOCK_SIZE);
---------------------------------------
Received: (at 294474-close) by bugs.debian.org; 31 Jul 2005 11:38:50 +0000
>From katie@spohr.debian.org Sun Jul 31 04:38:50 2005
Return-path: <katie@spohr.debian.org>
Received: from katie by spohr.debian.org with local (Exim 3.36 1 (Debian))
id 1DzC33-000316-00; Sun, 31 Jul 2005 04:32:05 -0700
From: Bastian Blank <waldi@debian.org>
To: 294474-close@bugs.debian.org
X-Katie: $Revision: 1.56 $
Subject: Bug#294474: fixed in busybox 1:1.00-4
Message-Id: <E1DzC33-000316-00@spohr.debian.org>
Sender: Archive Administrator <katie@spohr.debian.org>
Date: Sun, 31 Jul 2005 04:32:05 -0700
Delivered-To: 294474-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2005_01_02
Source: busybox
Source-Version: 1:1.00-4
We believe that the bug you reported is fixed in the latest version of
busybox, which is due to be installed in the Debian FTP archive:
busybox-floppy-udeb_1.00-4_i386.udeb
to pool/main/b/busybox/busybox-floppy-udeb_1.00-4_i386.udeb
busybox-static_1.00-4_i386.deb
to pool/main/b/busybox/busybox-static_1.00-4_i386.deb
busybox-udeb_1.00-4_i386.udeb
to pool/main/b/busybox/busybox-udeb_1.00-4_i386.udeb
busybox_1.00-4.diff.gz
to pool/main/b/busybox/busybox_1.00-4.diff.gz
busybox_1.00-4.dsc
to pool/main/b/busybox/busybox_1.00-4.dsc
busybox_1.00-4_i386.deb
to pool/main/b/busybox/busybox_1.00-4_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 294474@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Bastian Blank <waldi@debian.org> (supplier of updated busybox package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Sun, 31 Jul 2005 13:10:29 +0200
Source: busybox
Binary: busybox-floppy-udeb busybox busybox-udeb busybox-static
Architecture: source i386
Version: 1:1.00-4
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Bastian Blank <waldi@debian.org>
Description:
busybox - Tiny utilities for small and embedded systems
busybox-floppy-udeb - Tiny utilities for the debian-installer floppy images (udeb)
busybox-static - Standalone rescue shell with tons of builtin utilities
busybox-udeb - Tiny utilities for the debian-installer (udeb)
Closes: 294474
Changes:
busybox (1:1.00-4) unstable; urgency=low
.
* Fix several problems with more strict gcc. (closes: #294474)
Files:
7d587d50ee8e45b879b1c0aff4244cb1 690 - optional busybox_1.00-4.dsc
333b5c0dc907f811286bec7a06b07128 177327 - optional busybox_1.00-4.diff.gz
3f237fa7e435486b2fa1dcedba0f7895 131886 utils optional busybox_1.00-4_i386.deb
f906db73d8199bf7b290fef50ac1f620 673662 shells optional busybox-static_1.00-4_i386.deb
7b0c8efd41df546111100ccf97a49e39 130536 debian-installer extra busybox-udeb_1.00-4_i386.udeb
67b5694767cb9cddfd07c335aae75841 58046 debian-installer extra busybox-floppy-udeb_1.00-4_i386.udeb
package-type: udeb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iEYEARECAAYFAkLss/8ACgkQLkAIIn9ODhFaFgCePlQzcmqZrTuWjEYRVY2ARwti
pwYAn1Ja3xb/FZ+TUpqtZ1ObdLB8IxJx
=8xNl
-----END PGP SIGNATURE-----
Reply to: