Your message dated Tue, 15 Nov 2005 08:17:07 -0800
with message-id <[EMAIL PROTECTED]>
and subject line Bug#304079: fixed in hwinfo 8.38-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; 10 Apr 2005 18:08:51 +0000
>From [EMAIL PROTECTED] Sun Apr 10 11:08:51 2005
Return-path: <[EMAIL PROTECTED]>
Received: from d007114.adsl.hansenet.de (localhost.localdomain) [80.171.7.114]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1DKgra-0005KM-00; Sun, 10 Apr 2005 11:08:50 -0700
Received: from aj by localhost.localdomain with local (Exim 4.50)
id 1DKgrZ-0004uW-2x; Sun, 10 Apr 2005 20:08:49 +0200
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
From: Andreas Jochens <[EMAIL PROTECTED]>
Subject: hwinfo: FTBFS (ppc64/gcc-4.0): non-static declaration of
'hddb_internal_list' follows static declaration
Message-Id: <[EMAIL PROTECTED]>
Date: Sun, 10 Apr 2005 20:08:49 +0200
Delivered-To: [EMAIL PROTECTED]
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: hwinfo
Version: 8.38-3
Severity: normal
Tags: patch
When building 'hwinfo' on ppc64/unstable with gcc-4.0,
I get the following error:
make[4]: Entering directory `/hwinfo-8.38/build-tree/hwinfo-8.38/src/ids'
gcc -c -Wall -O2 -pipe -g -I../../src/hd hd_ids.c
In file included from hd_ids.c:5:
hd_ids.h:11: error: non-static declaration of 'hddb_internal_list' follows
static declaration
hd_ids.h:1: error: previous declaration of 'hddb_internal_list' was here
hd_ids.h:11805: error: non-static declaration of 'hddb_internal_ids' follows
static declaration
hd_ids.h:2: error: previous declaration of 'hddb_internal_ids' was here
hd_ids.h:17688: error: non-static declaration of 'hddb_internal_strings'
follows static declaration
hd_ids.h:3: error: previous declaration of 'hddb_internal_strings' was here
make[4]: *** [hd_ids.o] Error 1
make[4]: Leaving directory `/hwinfo-8.38/build-tree/hwinfo-8.38/src/ids'
The attached patch fixes this and also some other ppc64/gcc-4.0 related
problems.
Regards
Andreas Jochens
diff -urN ../tmp-orig/hwinfo-8.38/debian/patches/810_hppa_and_m68k_port
./debian/patches/810_hppa_and_m68k_port
--- ../tmp-orig/hwinfo-8.38/debian/patches/810_hppa_and_m68k_port
2005-04-10 19:43:57.163212998 +0200
+++ ./debian/patches/810_hppa_and_m68k_port 2005-04-10 19:37:45.366436660
+0200
@@ -6,14 +6,14 @@
*/
-#if defined(__i386__) || defined(__x86_64__) || defined(__PPC__) ||
defined(__alpha__) || defined(__ia64__) || defined(__arm__) || defined(__mips__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__PPC__) ||
defined(__alpha__) || defined(__ia64__) || defined(__arm__) ||
defined(__mips__) || defined(__hppa__) || defined(__mc68000__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__PPC__) ||
defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) ||
defined(__arm__) || defined(__mips__) || defined(__hppa__) ||
defined(__mc68000__)
void hd_scan_kbd(hd_data_t *hd_data)
{
diff -ruN hwinfo-8.38/src/hd/hd.c hwinfo-8.38.new/src/hd/hd.c
--- hwinfo-8.38/src/hd/hd.c 2004-04-06 11:45:52.000000000 +0200
+++ hwinfo-8.38.new/src/hd/hd.c 2004-06-10 21:21:47.000000000 +0200
-@@ -111,6 +111,14 @@
+@@ -111,6 +111,18 @@
#define HD_ARCH "x86-64"
#endif
@@ -25,6 +25,10 @@
+#define HD_ARCH "m68k"
+#endif
+
++#ifdef __powerpc64__
++#define HD_ARCH "ppc64"
++#endif
++
typedef struct disk_s {
struct disk_s *next;
unsigned crc;
diff -urN ../tmp-orig/hwinfo-8.38/debian/patches/820_gcc4_fix
./debian/patches/820_gcc4_fix
--- ../tmp-orig/hwinfo-8.38/debian/patches/820_gcc4_fix 1970-01-01
01:00:00.000000000 +0100
+++ ./debian/patches/820_gcc4_fix 2005-04-10 19:43:52.022198244 +0200
@@ -0,0 +1,83 @@
+diff -urN tmp/src/int10/i10_v86.c hwinfo-8.38/src/int10/i10_v86.c
+--- tmp/src/int10/i10_v86.c 2003-10-28 11:44:31.000000000 +0100
++++ hwinfo-8.38/src/int10/i10_v86.c 2005-04-10 15:16:13.637536983 +0200
+@@ -230,7 +230,8 @@
+
SEG_ADR((CARD8 *),es,di),
+
CPU_REG_LW(eflags)&DF,
+
(is_rep? LWECX:1));
+- if (is_rep) LWECX = 0;
++ if (is_rep) { if (prefix66 ^ prefix67) CPU_REG(ecx) = 0; else
CPU_REG_LW(ecx) = 0;}
++
+ CPU_REG_LW(eip)++;
+ break;
+
+@@ -249,7 +250,7 @@
+
CPU_REG_LW(eflags)&DF,
+
(is_rep? LWECX:1));
+ }
+- if (is_rep) LWECX = 0;
++ if (is_rep) { if (prefix66 ^ prefix67) CPU_REG(ecx) = 0; else
CPU_REG_LW(ecx) = 0;}
+ CPU_REG_LW(eip)++;
+ break;
+
+@@ -259,7 +260,7 @@
+ CPU_REG_LW(esi) +=
port_rep_outb(CPU_REG_LW(edx),(CARD8*)INT2PTR(LIN_PREF_SI),
+
CPU_REG_LW(eflags)&DF,
+
(is_rep? LWECX:1));
+- if (is_rep) LWECX = 0;
++ if (is_rep) { if (prefix66 ^ prefix67) CPU_REG(ecx) = 0; else
CPU_REG_LW(ecx) = 0;}
+ CPU_REG_LW(eip)++;
+ break;
+
+@@ -278,7 +279,7 @@
+
CPU_REG_LW(eflags)&DF,
+
(is_rep? LWECX:1));
+ }
+- if (is_rep) LWECX = 0;
++ if (is_rep) { if (prefix66 ^ prefix67) CPU_REG(ecx) = 0; else
CPU_REG_LW(ecx) = 0;}
+ CPU_REG_LW(eip)++;
+ break;
+
+diff -urN tmp/src/ids/check_hd.c hwinfo-8.38/src/ids/check_hd.c
+--- tmp/src/ids/check_hd.c 2003-09-08 18:30:31.000000000 +0200
++++ hwinfo-8.38/src/ids/check_hd.c 2005-04-10 19:42:41.546703368 +0200
+@@ -2818,7 +2818,7 @@
+ hddb.strings_len, hddb.strings_len
+ );
+
+- fprintf(f, "hddb_list_t hddb_internal_list[%u] = {\n", hddb.list_len);
++ fprintf(f, "static hddb_list_t hddb_internal_list[%u] = {\n",
hddb.list_len);
+ for(u = 0; u < hddb.list_len; u++) {
+ fprintf(f,
+ " { 0x%08x, 0x%08x, 0x%08x, 0x%08x }%s\n",
+@@ -2829,7 +2829,7 @@
+ }
+ fprintf(f, "};\n\n");
+
+- fprintf(f, "unsigned hddb_internal_ids[%u] = {\n", hddb.ids_len);
++ fprintf(f, "static unsigned hddb_internal_ids[%u] = {\n", hddb.ids_len);
+ for(u = 0; u < hddb.ids_len; u++) {
+ if((u % 6) == 0) fputc(' ', f);
+ fprintf(f, " 0x%08x", hddb.ids[u]);
+@@ -2840,7 +2840,7 @@
+
+ qstr = quote_string(hddb.strings, hddb.strings_len);
+ qstr_len = qstr ? strlen(qstr) : 0;
+- fprintf(f, "char hddb_internal_strings[%u] = \"\\\n", hddb.strings_len);
++ fprintf(f, "static char hddb_internal_strings[%u] = \"\\\n",
hddb.strings_len);
+ for(u = 0; u < qstr_len; ) {
+ len = qstr_len - u;
+ if(len > 72) len = 72;
+diff -urN tmp/Makefile hwinfo-8.38/Makefile
+--- tmp/Makefile 2004-03-28 18:27:42.000000000 +0200
++++ hwinfo-8.38/Makefile 2005-04-10 19:41:00.814002994 +0200
+@@ -8,7 +8,7 @@
+
+ include Makefile.common
+
+-SHARED_FLAGS =
++SHARED_FLAGS = -fPIC
+ OBJS_NO_TINY = names.o parallel.o modem.o
+
+ .PHONY: fullstatic static shared tiny doc diet tinydiet uc tinyuc
+
---------------------------------------
Received: (at 304079-close) by bugs.debian.org; 15 Nov 2005 16:22:48 +0000
>From [EMAIL PROTECTED] Tue Nov 15 08:22:48 2005
Return-path: <[EMAIL PROTECTED]>
Received: from katie by spohr.debian.org with local (Exim 4.50)
id 1Ec3UZ-0003zc-QV; Tue, 15 Nov 2005 08:17:07 -0800
From: Morten Werner Olsen <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
X-Katie: $Revision: 1.56 $
Subject: Bug#304079: fixed in hwinfo 8.38-4
Message-Id: <[EMAIL PROTECTED]>
Sender: Archive Administrator <[EMAIL PROTECTED]>
Date: Tue, 15 Nov 2005 08:17:07 -0800
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
X-CrossAssassin-Score: 3
Source: hwinfo
Source-Version: 8.38-4
We believe that the bug you reported is fixed in the latest version of
hwinfo, which is due to be installed in the Debian FTP archive:
hwinfo_8.38-4.diff.gz
to pool/main/h/hwinfo/hwinfo_8.38-4.diff.gz
hwinfo_8.38-4.dsc
to pool/main/h/hwinfo/hwinfo_8.38-4.dsc
hwinfo_8.38-4_i386.deb
to pool/main/h/hwinfo/hwinfo_8.38-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 [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Morten Werner Olsen <[EMAIL PROTECTED]> (supplier of updated hwinfo 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 [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Mon, 14 Nov 2005 18:58:17 +0100
Source: hwinfo
Binary: hwinfo
Architecture: source i386
Version: 8.38-4
Distribution: unstable
Urgency: low
Maintainer: Morten Werner Olsen <[EMAIL PROTECTED]>
Changed-By: Morten Werner Olsen <[EMAIL PROTECTED]>
Description:
hwinfo - Hardware identification system
Closes: 304079 304079 329185 329240
Changes:
hwinfo (8.38-4) unstable; urgency=low
.
* Replaced 810_hppa_and_m68k_port with 800_new_archs which now includes
hppa, m68k, and ppc64 (thanks to Andreas Jochens).
(Closes: #304079, #329240)
* Added 810_gcc4_fix to make hwinfo build with gcc4 (thanks to
Andreas Johens). (Closes: #304079)
* Added 820_amd64_fix which fixes some assembly bugs with 64bit arch
(thanks to Andreas Johens). (Closes: #329185)
* Bumped Standards-Version to 3.6.2 (no changes).
Files:
5653708dae6cf3e3220f02550bdd6055 604 admin optional hwinfo_8.38-4.dsc
4b2361cdc479a14e70f197839c0edd68 5779 admin optional hwinfo_8.38-4.diff.gz
63fbde2832f8cf4e070759ae363740bd 371822 admin optional hwinfo_8.38-4_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQFDege+8g+sC3uDV+URAqSfAJ4u6JPyRuGgXDBH+wbH3YlBJDjHtACfcqdE
IcJTInlaSO0DLBcEZuT1ygg=
=cTYc
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
