Branden Robinson wrote:
[I am not subscribed to -s390; please follow-up to -x as well.]
Can an s390 person please test revision 1177 of the trunk in the XSF SVN
repository of XFree86?
The goal of that change was to make sure that s390 stops uselessly
setting up and building the xc-xserver-xfree86-dbg directory. This
should speed up the build a little.
First of all I have got an upstream error, missing semicolon.
session.c: In function `source':
session.c:786: error: parse error before "return"
make[5]: *** [session.o] Error 1
make[5]: Leaving directory
`/home/ton/xfree86-4.3.0/build-tree/xc/programs/xdm'
After I had fixed that, I had to disable install of xserver-wrapper,
since it isn't available on s390.
--- debian/rules.bak 2004-03-31 12:37:03.000000000 +0000
+++ debian/rules 2004-03-31 12:36:02.000000000 +0000
@@ -283,8 +283,10 @@
rm -f $(DEBTREEDIR)/usr/X11R6/lib/X11/icons/default/index.theme
# remove the upstream symlink X -> XFree86
rm -f $(DEBTREEDIR)/usr/X11R6/bin/X
+ifndef NOT_BUILDING_XFREE86_X_SERVER
# install Debian's X server wrapper
install -m 755 debian/local/xserver-wrapper
$(DEBTREEDIR)/usr/X11R6/bin/X
+endif
install -m 644 debian/local/Xwrapper.config.5
$(DEBTREEDIR)/usr/share/man/man5
install -m 755 debian/local/xserverrc $(DEBTREEDIR)/etc/X11/xinit
# install Debian's XF86Config generator
For the time being I created an empty X file and completed the build
successfully and was then able to install the debs.
Gerhard