Author: branden
Date: 2004-03-23 01:51:26 -0500 (Tue, 23 Mar 2004)
New Revision: 1172
Added:
trunk/debian/patches/076_xfree86_server_fix_aout_loader_include.diff
Modified:
trunk/debian/TODO
trunk/debian/changelog
Log:
Fix compilation of a.out object loader on uClibc (and possibly other
non-GNU-libc systems) in XFree86 X server by including correct header file
for ntohl() prototype (thanks, Erik Andersen). (Closes: #216806)
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2004-03-22 22:19:18 UTC (rev 1171)
+++ trunk/debian/TODO 2004-03-23 06:51:26 UTC (rev 1172)
@@ -21,7 +21,6 @@
Nusinow have provided good input.
+ udev users will have "/dev/input/mousen" -- configure that as only mouse
device? (see #237574)
-* Bug #216806: aoutloader missing header file for ntohl
* Fix upstream install rule that prevents Xcursor themes from being
installed on s390. As I understand it, this is client-side stuff and
there's not really any reason it shouldn't be made available on the s390
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-22 22:19:18 UTC (rev 1171)
+++ trunk/debian/changelog 2004-03-23 06:51:26 UTC (rev 1172)
@@ -5,10 +5,14 @@
FAQ for more information.
* Make xev flush standard output after processing each event, since its
- exit(0) is unreachable code (thanks, Bill Currie). (Closes: #238638).
+ exit(0) is unreachable code (thanks, Bill Currie). (Closes: #238638)
- -- Branden Robinson <[EMAIL PROTECTED]> Mon, 22 Mar 2004 17:17:20 -0500
+ * Fix compilation of a.out object loader on uClibc (and possibly other
+ non-GNU-libc systems) in XFree86 X server by including correct header file
+ for ntohl() prototype (thanks, Erik Andersen). (Closes: #216806)
+ -- Branden Robinson <[EMAIL PROTECTED]> Tue, 23 Mar 2004 01:49:03 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Added: trunk/debian/patches/076_xfree86_server_fix_aout_loader_include.diff
===================================================================
--- trunk/debian/patches/076_xfree86_server_fix_aout_loader_include.diff
2004-03-22 22:19:18 UTC (rev 1171)
+++ trunk/debian/patches/076_xfree86_server_fix_aout_loader_include.diff
2004-03-23 06:51:26 UTC (rev 1172)
@@ -0,0 +1,34 @@
+$Id$
+
+Erik Andersen reported:
+
+ I'm building xfree86 (as well as the rest of Debian) with uClibc,
+ which implements htonl only as a macro (which is explicitly
+ allowed per SuSv3). However this has produced a compile problem
+ when building xfree86 since aoutloader.c does not end up
+ including the correct header file, and gcc therefore assumes that
+ ntohl is supposed to be an extern function. With glibc, which
+ provides ntohl as both a macro and as a function, things will
+ still work even when the prototype is not found. With uClibc,
+ which only provides ntohl as a macro, this causes a link error
+ when trying to use aoutloader.o.
+
+Fix compilation of a.out object loader on uClibc (and possibly other
+non-GNU-libc systems) in XFree86 X server by including correct header file
+for ntohl() prototype. See Debian #216806.
+
+This patch by Erik Andersen.
+
+--- xc/programs/Xserver/hw/xfree86/loader/aout.h~ 2004-03-23
01:41:43.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/loader/aout.h 2004-03-23
01:44:07.000000000 -0500
+@@ -37,8 +37,8 @@
+
+ #include "Xos.h"
+
+-/* Get prototype for ntohl. */
+-#include <ctype.h>
++/* Get prototype for ntohl, per SuSv3. */
++#include <arpa/inet.h>
+
+ /* OS/2 EMX has ntohl in this file */
+ #ifdef __UNIXOS2__
Property changes on:
trunk/debian/patches/076_xfree86_server_fix_aout_loader_include.diff
___________________________________________________________________
Name: svn:keywords
+ Id
