Bug 2885

Summary:

Build failure in xf86Configure.c

Product:

xorg

Reporter:

Roland Mainz <roland.mainz>

Component:

* Other

Assignee:

Roland Mainz <roland.mainz>

Status:

RESOLVED FIXED

QA Contact:

Severity:

normal

Priority:

high

CC:

alan.coopersmith

Version:

git

Hardware:

SPARC

OS:

Solaris

Whiteboard:

i915 platform:

i915 features:

Attachments:

Description	Flags
Undefine symbols from <sys/kbd.h> that conflict with Xorg headers	none
Patch for 2005-04-15-trunk	none

Description Roland Mainz 2005-04-02 11:33:22 UTC

Xorg 2005-04-01-trunk (no 1st April joke ;-( ) build on Solaris 8 with Sun
Workshop/Forte 9 fails like this:
-- snip --
rm -f xf86Configure.o
cc -c -g -DDEBUG_gisburn -Xa -v -zlazyload -zcombreloc -xstrconst -xildoff   
-I. -I../../../../../programs/Xserver/hw/xfree86/os-support
-I../../../../../programs/Xserver/hw/xfree86/os-support/bus
-I../../../../../programs/Xserver/mfb  -I../../../../../programs/Xserver/mi
-I../../../../../programs/Xserver/include -I../../../../../programs/Xserver/os 
-I../../../../../exports/include/X11 -I../../../../../programs/Xserver/Xext
-I../../../../../include/extensions  -I../../../../../programs/Xserver/Xi
-I../../../../../programs/Xserver/hw/xfree86/ddc
-I../../../../../programs/Xserver/hw/xfree86/i2c 
-I../../../../../lib/font/include -I../../../../../include/fonts 
-I../../../../../programs/Xserver/hw/xfree86
-I../../../../../programs/Xserver/hw/xfree86/parser 
-I../../../../../programs/Xserver/hw/xfree86/loader
-I../../../../../programs/Xserver/hw/xfree86/vgahw
-I../../../../../programs/Xserver/hw/xfree86/rac 
-I../../../../../programs/Xserver/hw/xfree86/scanpci
-I../../../../../programs/Xserver/hw/xfree86/vbe
-I../../../../../programs/Xserver/hw/xfree86/int10 
-I../../../../../programs/Xserver/hw/xfree86/ddc
-I../../../../../programs/Xserver/render -I../../../randr  -I../../../../..
-I../../../../../exports/include   -Dsun -Dsparc -DSVR4 -D__EXTENSIONS__ -DSHAPE
-DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY -DTOGCUP  -DXF86BIGFONT
-DDPMSExtension  -DPIXPRIV -DPANORAMIX  -DRENDER -DRANDR -DXFIXES -DDAMAGE
-DCOMPOSITE -DXEVIE  -DINCLUDE_ALLOCA_H -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH
-DXFreeXDGA -DXvExtension -DXFree86LOADER -DDLOPEN_HACK -DXFree86Server
-DXF86VIDMODE -DXvMCExtension -DSMART_SCHEDULE -DBUILDDEBUG -DXResExtension
-DX_BYTE_ORDER=X_BIG_ENDIAN -DXORG_VERSION_CURRENT="(((6) * 10000000) + ((8) *
100000) + ((1) * 1000) + 99)"   -DNDEBUG        -DMULTIBUFFER -DMITMISC -DXTEST
-DXTRAP -DXSYNC -DXCMISC -DXRECORD -DMITSHM -DBIGREQS -DXF86VIDMODE -DXF86MISC
-DDBE -DDPMSExtension -DEVI -DSCREENSAVER -DXV -DXVMC -DGLXEXT  -DGLX_USE_MESA
-D__GLX_ALIGN64   -DRES -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR
-DDDXOSVERRORF  -D__XCONFIGFILE__='"xorg.conf"'
-D__XCONFIGDIR__='"/usr/X11R6/lib/X11"' -D__XLOGFILE__='"Xorg"'
-D__XSERVERNAME__='"Xorg"' -D__XKBDEFRULES__='"xorg"'
-D__VENDORDWEBSUPPORT__='"http://wiki.X.Org"'  -DXVENDORNAME='"The X.Org
Foundation"' -DXVENDORNAMESHORT='"X.Org"'  -DXF86CONFIGFILE='"xorg.conf"'
-DUSE_DEPRECATED_KEYBOARD_DRIVER xf86Configure.c
"../../../../../programs/Xserver/hw/xfree86/parser/xf86tokens.h", line 76:
syntax error before or at: 0x500
cc: acomp failed for xf86Configure.c
*** Error code 2
make: Fatal error: Command failed for target `xf86Configure.o'
Current working directory
/shared/bigtmp/xorg/work002/xc/programs/Xserver/hw/xfree86/common
-- snip --

Comment 1 Alan Coopersmith 2005-04-03 17:56:40 UTC

Created attachment 2299 [details] [review]
Undefine symbols from <sys/kbd.h> that conflict with Xorg headers

<sys/kbd.h> #defines STRING 0x500, which conflicts with the enum in
xf86Tokens.h

Not sure how or when this got broken, but I noticed it a couple of weeks ago,
though haven't gotten around to checking the fix into CVS yet.

Comment 2 Roland Mainz 2005-04-15 16:14:32 UTC

Taking bug for commit...

Comment 3 Roland Mainz 2005-04-15 16:17:14 UTC

alan:
Do you think it's usefull to file a RFE to move all the symbols into an own
namespace (like "STRING" --> "XTOK_STRING", "LEFTALT" --> "XTOK_LEFTALT"; a
better prefix than XTOK_ may be nice... :) to avoid further problems in this
area ?

Comment 4 Roland Mainz 2005-04-15 16:24:31 UTC

Created attachment 2434 [details] [review]
Patch for 2005-04-15-trunk

Same patch as attachment #2299 [details] [review] + Changelog diff.

Comment 5 Alan Coopersmith 2005-04-15 16:34:58 UTC

Sorry - I really have no idea what that could break - ask someone who knows the
Xorg keyboard code better.

Comment 6 Roland Mainz 2005-04-15 16:35:31 UTC

Patch checked-in...

cvs/xorg/xc/ChangeLog,v  <--  xc/ChangeLog
new revision: 1.876; previous revision: 1.875
/cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v  <-- 
xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
new revision: 1.6; previous revision: 1.5
Mailing the commit message to xorg-commit@lists.freedesktop.org...

... marking bug as FIXED.

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.