Bug#170510: X server build problem fix
Hi,
Here is a patch for #170508, #170510.
1) #170508
GLX library links libX11 and libXext like this:
gcc -o ./libGL.so.1.2~ -shared -Wl,-Bsymbolic -Wl,-soname,libGL.so.1 ../../../lib/GL/glx/clientattrib.o ../../../lib/GL/glx/compsize.o ../../../lib/GL/glx/dispatch.o ../../../lib/GL/glx/eval.o ../../../lib/GL/glx/g_render.o ../../../lib/GL/glx/g_single.o ../../../lib/GL/glx/g_vendpriv.o ../../../lib/GL/glx/glapi.o ../../../lib/GL/glx/glapi_x86.o ../../../lib/GL/glx/glthread.o ../../../lib/GL/glx/glxcmds.o ../../../lib/GL/glx/glxext.o ../../../lib/GL/glx/indirect_init.o ../../../lib/GL/glx/pixel.o ../../../lib/GL/glx/pixelstore.o ../../../lib/GL/glx/render2.o ../../../lib/GL/glx/renderpix.o ../../../lib/GL/glx/single2.o ../../../lib/GL/glx/singlepix.o ../../../lib/GL/glx/vertarr.o ../../../lib/GL/glx/xfont.o ../../../lib/GL/dri/XF86dri.o ../../../lib/GL/dri/dri_glx.o -lpthread -L../../../exports/lib -lXext -lX11 -ldl -lc
When `BuildGLXLibrary' is defined, we should build build libX11 and libXext.
(should define `BuildX11Lib' and `BuildXextLib')
2) #170510
xc/lib/X11/Imakefile structure like this:
------
(A lot of defines....)
#if !BuildServersOnly || XnestServer || BuildGLXLibrary || BuildClients
(nomal build phases)
#else
all::
BuildIncludes($(HEADERS),IncSubdir,..)
#endif
------
When `BuildServersOnly' is defined without XnestServer,
BuildGLXLibrary or BuildClients, lib/X11 dump its headers in
xc/export/include and do nothing else.
To build X server needs libX11 headers. But currently, will not run
`make -C xc/lib/X11'. We should define `BuildX11Lib' when
`BuildServersOnly' is defined.
--- xc/config/cf/X11.tmpl.ORIG 2002-12-30 21:22:36.000000000 +0900
+++ xc/config/cf/X11.tmpl 2002-12-30 21:23:12.000000000 +0900
@@ -239,7 +239,7 @@
#define BuildXAServer (HasXAServer & HasCplusplus)
#endif
#ifndef BuildX11Lib
-#define BuildX11Lib BuildLibraries
+#define BuildX11Lib BuildLibraries || BuildGLXLibrary || BuildServersOnly
#endif
#ifndef BuildLoadableXlibI18n
#define BuildLoadableXlibI18n (HasDlopen && SharedLibX11)
@@ -254,7 +254,7 @@
!(HasIssetugid || HasGetresuid)
#endif
#ifndef BuildXextLib
-#define BuildXextLib BuildLibraries
+#define BuildXextLib BuildLibraries || BuildGLXLibrary
#endif
#ifndef BuildXauLib
#define BuildXauLib (BuildLibraries || BuildLibrariesForXServers)
--
ISHIKAWA Mutsumi
<ishikawa@netvillage.co.jp>, <ishikawa@linux.or.jp>, <ishikawa@debian.org>
Reply to: