On Sat, Jul 8, 2006 at 21:42:11 +0200, Adeodato Simó wrote: > Hi, > > I'm raising the severity of this bug to critical because, although > xorg-server was never compiled in s390 before (thus bug was filed with > severity: important), it provides binary packages like xvfb that used to > be available for s390 and now are not, causing other packages to FTBFS > due to unmet build-dependencies. > xorg-server shouldn't even try to build Xorg on s390. Maybe the attached patch helps? It disables xorg and xdmx on this arch, but leaves xvfb and xnest enabled. Totally untested, as I don't have access to the hardware :)
Cheers, Julien
Index: xorg-server-1.0.2/debian/rules
===================================================================
--- xorg-server-1.0.2/debian/rules (revision 2563)
+++ xorg-server-1.0.2/debian/rules (working copy)
@@ -28,23 +28,23 @@
confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
endif
-INSTALL=/usr/bin/install
-
-# s390 chokes on inline functions. See #362641
ifeq ($(DEB_HOST_ARCH), s390)
- CFLAGS += -DNO_INLINE
+ confflags += --disable-xorg --disable-dmx --disable-dri
+else
+ confflags += --enable-xorg --enable-dmx --enable-dri
endif
+INSTALL=/usr/bin/install
+
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += --disable-static \
- --enable-xorg \
- --enable-dri --with-mesa-source=/usr/share/mesa-source \
+ --with-mesa-source=/usr/share/mesa-source \
--with-fontdir=/usr/share/fonts/X11 \
--with-serverconfig-path=/etc/X11/xserver \
--enable-xtrap \
- --enable-dmx \
--enable-vfb \
+ --enable-xnest \
--disable-lbx \
--disable-xprint \
--disable-xorgconfig \
signature.asc
Description: Digital signature
