NetBSD Problem Report #46578
From wiz@yt.nih.at Sun Jun 10 21:20:43 2012
Return-Path: <wiz@yt.nih.at>
Received: from mail.netbsd.org (mail.netbsd.org [149.20.53.66])
by www.NetBSD.org (Postfix) with ESMTP id C54D063B882
for <gnats-bugs@gnats.netbsd.org>; Sun, 10 Jun 2012 21:20:43 +0000 (UTC)
Message-Id: <20120610210441.6855D39F09D@yt.nih.at>
Date: Sun, 10 Jun 2012 23:04:41 +0200 (CEST)
From: Thomas Klausner <wiz@NetBSD.org>
Reply-To: Thomas Klausner <wiz@NetBSD.org>
To: gnats-bugs@gnats.NetBSD.org
Subject: HAVE_LLVM differences when building xsrc
X-Send-Pr-Version: 3.95
>Number: 46578
>Category: xsrc
>Synopsis: HAVE_LLVM differences when building xsrc
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: xsrc-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Sun Jun 10 21:25:00 +0000 2012
>Originator: Thomas Klausner
>Release: NetBSD 6.99.7
>Organization:
Curiosity is the very basis of education and if you tell me that
curiosity killed the cat, I say only that the cat died nobly.
- Arnold Edinborough
>Environment:
System: NetBSD yt 6.99.7 NetBSD 6.99.7 (YT) #16: Sun Jun 10 22:44:57 CEST 2012 wiz@yt:/usr/src/sys/arch/amd64/compile/obj/YT amd64
Architecture: x86_64
Machine: amd64
>Description:
When building X with clang (HAVE_LLVM) set instead of the default
gcc, a few X files in /etc differ. For some it doesn't matter, for
others it's probably a problem (because empty lines are added
before the "#!/bin/sh" line).
The cause is probably the different behaviour of the preprocessor.
>How-To-Repeat:
Build the same tree with X once with gcc, then with clang, do a
'diff -r' on the two resulting /etc directories, see:
diff -r 1ebd42fffc0d X11/fs/config
--- a/X11/fs/config Sun Jun 03 13:02:55 2012 +0200
+++ b/X11/fs/config Sun Jun 10 23:01:03 2012 +0200
@@ -1,3 +1,5 @@
+
+
diff -r 1ebd42fffc0d X11/proxymngr/pmconfig
--- a/X11/proxymngr/pmconfig Sun Jun 03 13:02:55 2012 +0200
+++ b/X11/proxymngr/pmconfig Sun Jun 10 23:01:03 2012 +0200
@@ -1,9 +1,11 @@
+
+
! proxy manager config file
!
! Each line has the format:
-! <serviceName> managed <startCommand>
-! or
-! <serviceName> unmanaged <proxyAddress>
+! <serviceName> managed <startCommand>
+! or
+! <serviceName> unmanaged <proxyAddress>
!
lbx managed /usr/X11R7/bin/lbxproxy
!
diff -r 1ebd42fffc0d X11/xdm/Xreset
--- a/X11/xdm/Xreset Sun Jun 03 13:02:55 2012 +0200
+++ b/X11/xdm/Xreset Sun Jun 10 23:01:03 2012 +0200
@@ -1,4 +1,6 @@
+
+
#!/bin/sh
# Deregister a login. (Derived from TakeConsole as follows:)
#
-/usr/X11R7/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" -x /etc/X11/xdm/Xservers -l $DISPLAY -h "" $USER
+/usr/X11R7/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" -x /etc/X11/xdm/Xservers -l $DISPLAY -h "" $USER
diff -r 1ebd42fffc0d X11/xdm/Xresources
--- a/X11/xdm/Xresources Sun Jun 03 13:02:55 2012 +0200
+++ b/X11/xdm/Xresources Sun Jun 10 23:01:03 2012 +0200
@@ -1,3 +1,5 @@
+
+
!
!
!
@@ -9,17 +11,17 @@
xlogin*login.translations: #override \
- Ctrl<Key>R: abort-display()\n\
- <Key>F1: set-session-argument(failsafe) finish-field()\n\
- <Key>Delete: delete-character()\n\
- <Key>Left: move-backward-character()\n\
- <Key>Right: move-forward-character()\n\
- <Key>Home: move-to-begining()\n\
- <Key>End: move-to-end()\n\
- Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()\n\
- <Key>KP_Enter: set-session-argument() finish-field()\n\
- Ctrl<Key>Return: set-session-argument(failsafe) finish-field()\n\
- <Key>Return: set-session-argument() finish-field()
+ Ctrl<Key>R: abort-display()\n\
+ <Key>F1: set-session-argument(failsafe) finish-field()\n\
+ <Key>Delete: delete-character()\n\
+ <Key>Left: move-backward-character()\n\
+ <Key>Right: move-forward-character()\n\
+ <Key>Home: move-to-begining()\n\
+ <Key>End: move-to-end()\n\
+ Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()\n\
+ <Key>KP_Enter: set-session-argument() finish-field()\n\
+ Ctrl<Key>Return: set-session-argument(failsafe) finish-field()\n\
+ <Key>Return: set-session-argument() finish-field()
xlogin*greeting: Welcome to CLIENTHOST
xlogin*namePrompt: \040\040\040\040\040\040\040Login:
@@ -30,19 +32,19 @@
xlogin*font: -adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1
xlogin*promptFont: -adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1
xlogin*failFont: -adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1
-xlogin*greetFace: Serif-24:bold:italic
-xlogin*face: Helvetica-18
-xlogin*promptFace: Helvetica-18:bold
-xlogin*failFace: Helvetica-18:bold
+xlogin*greetFace: Serif-24:bold:italic
+xlogin*face: Helvetica-18
+xlogin*promptFace: Helvetica-18:bold
+xlogin*failFace: Helvetica-18:bold
#else
xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
-xlogin*greetFace: Serif-18:bold:italic
-xlogin*face: Helvetica-12
-xlogin*promptFace: Helvetica-12:bold
-xlogin*failFace: Helvetica-14:bold
+xlogin*greetFace: Serif-18:bold:italic
+xlogin*face: Helvetica-12
+xlogin*promptFace: Helvetica-12:bold
+xlogin*failFace: Helvetica-14:bold
#endif
#ifdef COLOR
@@ -66,23 +68,23 @@
#endif
#if PLANES >= 8
-xlogin*logoFileName: /usr/X11R7/include/X11/pixmaps/NetBSD.xpm
+xlogin*logoFileName: /usr/X11R7/include/X11/pixmaps /NetBSD.xpm
#else
-xlogin*logoFileName: /usr/X11R7/include/X11/pixmaps/NetBSD-bw.xpm
+xlogin*logoFileName: /usr/X11R7/include/X11/pixmaps /NetBSD-bw.xpm
#endif
xlogin*useShape: true
xlogin*logoPadding: 10
-XConsole.text.geometry: 480x130
-XConsole.verbose: true
-XConsole*iconic: true
-XConsole*font: fixed
+XConsole.text.geometry: 480x130
+XConsole.verbose: true
+XConsole*iconic: true
+XConsole*font: fixed
-Chooser*geometry: 700x500+300+200
-Chooser*allowShellResize: false
-Chooser*viewport.forceBars: true
-Chooser*label.font: *-new century schoolbook-bold-i-normal-*-240-*
-Chooser*label.label: XDMCP Host Menu from CLIENTHOST
-Chooser*list.font: -*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1
-Chooser*Command.font: *-new century schoolbook-bold-r-normal-*-180-*
+Chooser*geometry: 700x500+300+200
+Chooser*allowShellResize: false
+Chooser*viewport.forceBars: true
+Chooser*label.font: *-new century schoolbook-bold-i-normal-*-240-*
+Chooser*label.label: XDMCP Host Menu from CLIENTHOST
+Chooser*list.font: -*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1
+Chooser*Command.font: *-new century schoolbook-bold-r-normal-*-180-*
diff -r 1ebd42fffc0d X11/xdm/Xservers.ws
--- a/X11/xdm/Xservers.ws Sun Jun 03 13:02:55 2012 +0200
+++ b/X11/xdm/Xservers.ws Sun Jun 10 23:01:03 2012 +0200
@@ -1,12 +1,14 @@
+
+
#
# Xservers file, workstation prototype
#
# This file should contain an entry to start the server on the
# local display; if you have more than one display (not screen),
-# you can add entries to the list (one per line). If you also
+# you can add entries to the list (one per line). If you also
# have some X terminals connected which do not support XDMCP,
-# you can add them here as well. Each X terminal line should
+# you can add them here as well. Each X terminal line should
# look like:
-# XTerminalName:0 foreign
+# XTerminalName:0 foreign
#
:0 local /usr/X11R7/bin/X :0 -noretro vt05
diff -r 1ebd42fffc0d X11/xdm/Xsession
--- a/X11/xdm/Xsession Sun Jun 03 13:02:55 2012 +0200
+++ b/X11/xdm/Xsession Sun Jun 10 23:01:03 2012 +0200
@@ -1,3 +1,5 @@
+
+
#!/bin/sh
#
@@ -6,28 +8,28 @@
errfile="$HOME/.xsession-errors"
if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null )
then
- exec > "$errfile" 2>&1
+ exec > "$errfile" 2>&1
else
- mktemp=/usr/bin/mktemp
- for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
- do
- if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)"
- then
- exec > "$ef" 2>&1
- mv "$ef" "$errfile" 2> /dev/null
- break
- fi
- done
+ mktemp=/usr/bin/mktemp
+ for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+ do
+ if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)"
+ then
+ exec > "$ef" 2>&1
+ mv "$ef" "$errfile" 2> /dev/null
+ break
+ fi
+ done
fi
case $# in
1)
- case $1 in
- failsafe)
- exec /usr/X11R7/bin/xterm -geometry 80x24-0-0
- ;;
- esac
+ case $1 in
+ failsafe)
+ exec /usr/X11R7/bin/xterm -geometry 80x24-0-0
+ ;;
+ esac
esac
# The startup script is not intended to have arguments.
@@ -36,14 +38,14 @@
resources=$HOME/.Xresources
if [ -s "$startup" ]; then
- if [ -x "$startup" ]; then
- exec "$startup"
- else
- exec /bin/sh "$startup"
- fi
+ if [ -x "$startup" ]; then
+ exec "$startup"
+ else
+ exec /bin/sh "$startup"
+ fi
else
- if [ -r "$resources" ]; then
- /usr/X11R7/bin/xrdb -load "$resources"
- fi
- exec /usr/X11R7/bin/xsm
+ if [ -r "$resources" ]; then
+ /usr/X11R7/bin/xrdb -load "$resources"
+ fi
+ exec /usr/X11R7/bin/xsm
fi
diff -r 1ebd42fffc0d X11/xdm/Xstartup
--- a/X11/xdm/Xstartup Sun Jun 03 13:02:55 2012 +0200
+++ b/X11/xdm/Xstartup Sun Jun 10 23:01:03 2012 +0200
@@ -1,4 +1,6 @@
+
+
#!/bin/sh
# Register a login (derived from GiveConsole as follows:)
#
-exec /usr/X11R7/bin/sessreg -a -w /var/log/wtmp -u /var/run/utmp -x /etc/X11/xdm/Xservers -l $DISPLAY -h "" $USER
+exec /usr/X11R7/bin/sessreg -a -w /var/log/wtmp -u /var/run/utmp -x /etc/X11/xdm/Xservers -l $DISPLAY -h "" $USER
diff -r 1ebd42fffc0d X11/xdm/xdm-config
--- a/X11/xdm/xdm-config Sun Jun 03 13:02:55 2012 +0200
+++ b/X11/xdm/xdm-config Sun Jun 10 23:01:03 2012 +0200
@@ -1,3 +1,5 @@
+
+
!
!
!
@@ -9,31 +11,31 @@
-DisplayManager.authDir: /var/db/xdm
-DisplayManager.errorLogFile: /var/log/xdm.log
-DisplayManager.pidFile: /var/run/xdm.pid
-DisplayManager.keyFile: /e
>Fix:
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2007
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.