Package: xfree86
Severity: important
Tags: patch
Since the wacom driver got updated in -9, it no longer builds on
hurd-i386:
gcc -c -O0 -ansi -pedantic -Wall -Wpointer-arith -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations
-Wredundant-decls -Wnested-externs -Wundef -I.
-I../../../../../../programs/Xserver/hw/xfree86/common
-I../../../../../../programs/Xserver/hw/xfree86/loader
-I../../../../../../programs/Xserver/hw/xfree86/os-support
-I../../../../../../programs/Xserver/include
-I../../../../../../programs/Xserver/mi
-I../../../../../../exports/include/X11
-I../../../../../../include/extensions -I../../../../../..
-I../../../../../../exports/include -I/usr/X11R6/include
-D__GNU__ -D__i386__ -D_POSIX_C_SOURCE=199309L
-D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE
-D_SVID_SOURCE -D_GNU_SOURCE -DSHAPE -DXINPUT -DXKB -DLBX
-DXAPPGROUP -DXCSECURITY -DTOGCUP -DXF86BIGFONT
-DDPMSExtension -DPIXPRIV -DPANORAMIX -DRENDER -DRANDR
-DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH
-DXFreeXDGA -DXvExtension -DXFree86Server -DXF86VIDMODE
-DXvMCExtension -DSMART_SCHEDULE -DBUILDDEBUG
-DXResExtension -DX_BYTE_ORDER=X_LITTLE_ENDIAN -DNDEBUG
-DFUNCPROTO=15 -DNARROWPROTO -DXFree86Module wcmCommon.c
In file included from wcmCommon.c:24:
xf86Wacom.h:456:5: warning: "LINUX_INPUT" is not defined
wcmCommon.c: In function `xf86WcmSendEvents':
wcmCommon.c:485: warning: ISO C89 forbids mixed declarations and code
wcmCommon.c: In function `xf86WcmEvent':
wcmCommon.c:828: error: `gWacomUSBDevice' undeclared (first use in this
function)
wcmCommon.c:828: error: (Each undeclared identifier is reported only
once
wcmCommon.c:828: error: for each function it appears in.)
make[8]: *** [wcmCommon.o] Error 1
The reason is that LINUX_INPUT is not defined on hurd-i386 (I guess it
should not?), and wcmCommon.c declares gWacomUSBDevice guarded by #ifdef
LINUX_INPUT, while it is not guarded when it gets used later on,
resulting in this error.
As the wacom driver is pretty uninteresting to GNU/Hurd at this point, I
suggest simply not building it on hurd-i386 for the time being by
overriding XInputDrivers in xc/config/cf/gnu.cf. Patch updating #800
attached (it also changes the defines to include -D_GNU_SOURCE, which
was an oversight).
thanks,
Michael
Index: patches/800_gnu_config.diff
===================================================================
--- patches/800_gnu_config.diff (revision 2195)
+++ patches/800_gnu_config.diff (working copy)
@@ -12,9 +13,10 @@
# define HasKatmaiSupport NO
#endif
---- xc/config/cf/gnu.cf~ 2004-07-27 13:17:07.000000000 +0200
-+++ xc/config/cf/gnu.cf 2004-07-27 17:14:26.000000000 +0200
-@@ -18,6 +18,154 @@
+diff -Naur xc.orig/config/cf/gnu.cf xc/config/cf/gnu.cf
+--- xc/config/cf/gnu.cf~ 2005-02-16 01:18:29.701334208 +0100
++++ xc/config/cf/gnu.cf 2005-02-16 01:08:35.000000000 +0100
+@@ -18,9 +18,157 @@
#endif
XCOMM operating system: OSName
(OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
@@ -168,7 +170,11 @@
+
#define GNUSourceDefines -D_POSIX_C_SOURCE=199309L \
-D_POSIX_SOURCE -D_XOPEN_SOURCE \
- -D_BSD_SOURCE -D_SVID_SOURCE
+- -D_BSD_SOURCE -D_SVID_SOURCE
++ -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE
+
+ XCOMM XXXMB: What about _GNU_SOURCE, see Linux/UseInstalled?
+
@@ -66,6 +214,14 @@
#define HasNCurses YES
#endif
@@ -210,3 +216,16 @@
#define ConnectionFlags -DUNIXCONN -DTCPCONN
#ifndef StaticLibrary
+@@ -161,6 +325,12 @@
+
+ #include <gnuLib.rules>
+
++#define XInputDrivers mouse keyboard /* acecad */ calcomp citron \
++ digitaledge dmc dynapro elographics tek4957 \
++ microtouch mutouch penmount spaceorb summa \
++ void magellan /* magictouch */ hyperpen \
++ jamstudio fpit palmax
++
+ XCOMM XXX Might need this if they are not careful with slashes.
+ XCOMM #define DirFailPrefix -
+
