Bug#170510: Bug#170508: Bug#170510: X server build problem fix
>>>>> In <[🔎] 20030101224833.GD23239@redwald.deadbeast.net>
>>>>> Branden Robinson <branden@debian.org> wrote:
>> > This fix is not enough for these bug reports?
>>
>> It's enough, but it's not, in my opinion, optimal. It's silly to
>> compile Xlib and Xext *object* files when all that are needed are the
>> headers. However, rectifying this silliness probably means extensive
>> Imake surgery on the source tree.
OK, I understand :-) Perhaps we will solve them.
They are additional patches (but they are not tested yet.
please wait a moment...)
1) Objects and headers of GLX libraries are not required for X
servers build. So I do not know why libGL should built when
defined `BuildServersOnly'.
When `BuildXF86DRI' defined as YES, `BuildGLXLibrary' is
always defined as YES in xfree86.cf. I believe this is a
bug of upstream code. The patch perhaps solve this.
--- xc/config/cf/xfree86.cf.orig 2003-01-02 04:27:21.000000000 +0900
+++ xc/config/cf/xfree86.cf 2003-01-02 04:33:52.000000000 +0900
@@ -1167,7 +1167,11 @@
#if BuildXF86DRI
#ifndef BuildGLXLibrary
-#define BuildGLXLibrary YES
+# if defined(BuildServersOnly) && BuildServersOnly
+# define BuildGLXLibrary NO
+# else
+# define BuildGLXLibrary YES
+# endif
#endif
/*
With this additional patch, libGL will not built. So, we does not
need to build libXext and libX11 for it.
2) Defined `BuildServersOnly' will build only X servers.
`Servers' mean `XFree86 server, Xnest server, X virtual fareme
buffer server, and Xprint server'.
The Xnest server requires libX11, so defined and only definied
`BuildServersOnly'. So we should build libX11 for it.
We only need XFree86 (static linked with debug flag) server.
Xnest, Xvfb and Xprt static linked servers are not needed.
I think we can add `-DXnestServer=NO
-DXVirtualFramebufferServer=NO -DXprtServer=NO' flags for
SERVERDEBUG_IMAKE_DEFINES in debian/rules to solve this.
--- debian/rules.orig 2002-12-30 21:17:28.000000000 +0900
+++ debian/rules 2003-01-02 05:44:17.000000000 +0900
@@ -57,7 +57,7 @@
# don't get rid of the space in the next line
IMAKE_DEFINES+= $(DEBUGFLAGS)
endif
-SERVERDEBUG_IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian (static) $(SOURCE_VERSION) $(shell env TZ=UTC date +%Y%m%d%H%M%S) $(BUILDER)\"' -DBuilderEMailAddr='\"$(BUILDER_EMAIL_ADDR)\"' -DBuildServersOnly=YES -DDoLoadableServer=NO $(DEBUGFLAGS)
+SERVERDEBUG_IMAKE_DEFINES:=-DXFree86CustomVersion='\"Debian (static) $(SOURCE_VERSION) $(shell env TZ=UTC date +%Y%m%d%H%M%S) $(BUILDER)\"' -DBuilderEMailAddr='\"$(BUILDER_EMAIL_ADDR)\"' -DBuildServersOnly=YES -DDoLoadableServer=NO -DXnestServer=NO -DXVirtualFramebufferServer=NO -DXprtServer=NO $(DEBUGFLAGS)
# Determine our architecture.
BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
--
ISHIKAWA Mutsumi
<ishikawa@netvillage.co.jp>, <ishikawa@linux.or.jp>, <ishikawa@debian.org>
Reply to: