Bug#105554: marked as done ([hurd] doesn't build)
Your message dated 08 Aug 2004 15:13:21 -0700
with message-id <87hdrd1doe.fsf@becket.becket.net>
and subject line already fixed
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; 16 Jul 2001 22:32:53 +0000
>From Marcus.Brinkmann@ruhr-uni-bochum.de Mon Jul 16 17:32:53 2001
Return-path: <Marcus.Brinkmann@ruhr-uni-bochum.de>
Received: from (ulysses.g10code.de) [::ffff:212.23.136.22]
by master.debian.org with esmtp (Exim 3.12 1 (Debian))
id 15MGv6-0001bN-00; Mon, 16 Jul 2001 17:32:53 -0500
Received: from marcus by ulysses.g10code.de with local (Exim 3.16 #3 (Debian))
id 15MGuu-000AGh-00
for <submit@bugs.debian.org>; Tue, 17 Jul 2001 00:32:40 +0200
Date: Tue, 17 Jul 2001 00:32:37 +0200
To: submit@bugs.debian.org
Subject: [hurd] doesn't build
Message-ID: <20010717003237.A37826@212.23.136.22>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2i
From: Marcus Brinkmann <Marcus.Brinkmann@ruhr-uni-bochum.de>
Delivered-To: submit@bugs.debian.org
Package: libarr
Version: 0.1-47
Severity: important
Howdy,
here is the port of libarr to the Hurd. The Hurd returns i386-AT386
on uname -m, which is not a valid cpp symbol, which causes the
-Di386-AT386 to trigger an error message: The compilation will fail.
Instead fixing the generation of the $(ARCH) symbol, I threw out the whole
code related to it. It must break here and there. Every system which is
worth its name has some standard identifiers in the gcc specs file
(check yourself with gcc -E -dM -, CTRL-D). Those are to be used.
For something more fancy, one should use autoconf (config.guess, etc).
With the below patch, libarr compiles fine on the Hurd.
My patch also removes the vague attempt to define i386 on i386 portable
systems. First, this feature isn't needed anywhere, and second, it is better
left to the day when it is required to decide what is the best way to handle
it.
Thanks,
Marcus
diff -ru libarr-0.1.old/Makefile.incl libarr-0.1/Makefile.incl
--- libarr-0.1.old/Makefile.incl Sat Aug 26 02:20:17 2000
+++ libarr-0.1/Makefile.incl Tue Jul 17 00:18:51 2001
@@ -12,7 +12,7 @@
CC ?= gcc # ANSI-compatible C compiler
CFLAGS ?= -O2 -pipe -g3
CFLAGS += -fomit-frame-pointer -fexpensive-optimizations -I$(TREE)/include
-CFLAGS += -Wall -D$(ARCH) -D_$(SYSTEM)_
+CFLAGS += -Wall
LDFLAGS ?= -rdynamic
SHARED = -shared
@@ -24,16 +24,3 @@
SED = `which sed`
-#
-# We need to know the architecture name here. We assume iN86 is i386,
-# as we don't support any extensions yet. Also, we want this to work on all
-# make(1) variants (BSD (!=), GNU ($shell), etc.):
-ARCH != uname -m | sed -e 's/i[0-9]86/i386/'
-ARCH ?= $(shell uname -m | sed -e 's/i[0-9]86/i386/')
-ARCH ?= `uname -m | sed -e 's/[0-9]86/i386'`
-
-#
-# Additionally, for portability sake, we want to know the system type:
-SYSTEM != uname -s
-SYSTEM ?= $(shell uname -s)
-SYSTEM ?= `uname -s`
diff -ru libarr-0.1.old/debpatch libarr-0.1/debpatch
--- libarr-0.1.old/debpatch Fri Jul 6 22:14:35 2001
+++ libarr-0.1/debpatch Tue Jul 17 00:21:28 2001
@@ -6,7 +6,7 @@
#include <ctype.h>
+#include <string.h>
- #if defined(_Linux_)
+ #if defined(__linux__)
#include <sys/kd.h>
--- source/printf.c.save Tue Jul 3 10:51:57 2001
+++ source/printf.c Tue Jul 3 10:52:24 2001
diff -ru libarr-0.1.old/include/types.h libarr-0.1/include/types.h
--- libarr-0.1.old/include/types.h Wed Nov 29 03:09:28 2000
+++ libarr-0.1/include/types.h Tue Jul 17 00:23:39 2001
@@ -17,14 +17,6 @@
/* XXX platform specific type definitions:
*/
-/* I don't think these are needed...they'll probably be gone soon
- * -- <plypkie@debian.org>
- */
-#if !defined(i386) && (defined(i486) || defined(i586) || defined(i686))
-#define i386
-#endif
-
-
typedef unsigned long ptr_size_t;
#undef NULL
diff -ru libarr-0.1.old/source/input.c libarr-0.1/source/input.c
--- libarr-0.1.old/source/input.c Fri Jul 6 22:14:46 2001
+++ libarr-0.1/source/input.c Tue Jul 17 00:21:51 2001
@@ -34,7 +34,7 @@
#include <ctype.h>
#include <string.h>
-#if defined(_Linux_)
+#if defined(__linux__)
#include <sys/kd.h>
#endif
@@ -50,7 +50,7 @@
static struct termios orig_term;
static byte_t set_term;
-#if defined(_Linux_)
+#if defined(__linux__)
static struct kbentry orig_kbe;
static struct kbsentry orig_kbs;
static byte_t set_kb;
@@ -61,7 +61,7 @@
{
struct termios term;
-#if defined(_Linux_)
+#if defined(__linux__)
/* The keyboard remapping code works on Linux only. Everything else
* will have to do without shift-tab for now...
*/
@@ -84,7 +84,7 @@
else
++set_term;
-#if defined(_Linux_)
+#if defined(__linux__)
kbe.kb_table = orig_kbe.kb_table = 1; /* shift */
kbe.kb_index = orig_kbe.kb_index = 15; /* tab */
kbs.kb_func = orig_kbs.kb_func = (128 - 1); /* F128 (arbitrary) */
@@ -109,7 +109,7 @@
int
input_reset(void)
{
-#if defined(_Linux_)
+#if defined(__linux__)
int r = 0;
if ((set_kb) && ((ioctl(0, KDSKBENT, &orig_kbe) < 0) ||
diff -ru libarr-0.1.old/source/ktree.c libarr-0.1/source/ktree.c
--- libarr-0.1.old/source/ktree.c Sat Aug 26 02:20:18 2000
+++ libarr-0.1/source/ktree.c Tue Jul 17 00:22:10 2001
@@ -138,7 +138,7 @@
read_modifiers(qp)
arr_kqueue *qp;
{
-#if defined(TIOCLINUX) && defined(_Linux_)
+#if defined(TIOCLINUX) && defined(__linux__)
char mod;
mod = 6;
---------------------------------------
Received: (at 105554-done) by bugs.debian.org; 8 Aug 2004 22:13:21 +0000
>From tb@becket.net Sun Aug 08 15:13:21 2004
Return-path: <tb@becket.net>
Received: from vp085189.reshsg.uci.edu (becket.becket.net) [128.195.85.189]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1Btvur-00058B-00; Sun, 08 Aug 2004 15:13:21 -0700
Received: from tb by becket.becket.net with local (Exim 4.34)
id 1Btvur-0002FA-90
for 105554-done@bugs.debian.org; Sun, 08 Aug 2004 15:13:21 -0700
To: 105554-done@bugs.debian.org
Subject: already fixed
X-Reply-Permission: Posted or emailed replies to this message constitute
permission for an emailed response.
X-PGP-Fingerprint: 1F0A1E51 63 28 EB DA E6 44 E5 5E EC F3 04 26 4E BF 1A 92
X-Windows: Form follows malfunction.
From: Thomas Bushnell BSG <tb@becket.net>
Date: 08 Aug 2004 15:13:21 -0700
Message-ID: <87hdrd1doe.fsf@becket.becket.net>
Lines: 4
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Delivered-To: 105554-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no
version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
This bug was fixed in version 0.1-49 of libarr.
Thomas
Reply to: