[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r1871 - trunk/xserver/xorg-server-1.0.2/debian



Author: dnusinow
Date: 2006-04-19 01:55:50 -0400 (Wed, 19 Apr 2006)
New Revision: 1871

Modified:
   trunk/xserver/xorg-server-1.0.2/debian/changelog
   trunk/xserver/xorg-server-1.0.2/debian/rules
Log:
* Use -DNO_INLINE on s390. Thanks Bastian Blank and Julien Cristau.
  (closes: #362641)

Modified: trunk/xserver/xorg-server-1.0.2/debian/changelog
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/changelog	2006-04-19 05:52:35 UTC (rev 1870)
+++ trunk/xserver/xorg-server-1.0.2/debian/changelog	2006-04-19 05:55:50 UTC (rev 1871)
@@ -1,3 +1,10 @@
+xorg-server (1:1.0.2-6) unstable; urgency=low
+
+  * Use -DNO_INLINE on s390. Thanks Bastian Blank and Julien Cristau.
+    (closes: #362641)
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 19 Apr 2006 01:51:34 -0400
+
 xorg-server (1:1.0.2-5) unstable; urgency=low
 
   * Add 11_debian_always_use_default_font_path.diff from Eugene Konev. This

Modified: trunk/xserver/xorg-server-1.0.2/debian/rules
===================================================================
--- trunk/xserver/xorg-server-1.0.2/debian/rules	2006-04-19 05:52:35 UTC (rev 1870)
+++ trunk/xserver/xorg-server-1.0.2/debian/rules	2006-04-19 05:55:50 UTC (rev 1871)
@@ -30,6 +30,11 @@
 
 INSTALL=/usr/bin/install
 
+# s390 chokes on inline functions. See #362641
+ifeq ($(DEB_HOST_ACH), 's390')
+	CFLAGS += '-DNO_INLINE'
+endif
+
 # disable-static is so we don't get libfoo.a for modules.  now if only we could
 # kill the .las.
 confflags += --disable-static \



Reply to: