Attachment 1817 Details for Bug 2245 – Link libos.a after libxkb.a

[patch] Link libos.a after libxkb.a

xkbdepend.diff (text/plain), 1.19 KB, created by Alexander Gottwald on 2005-02-02 06:20:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Gottwald

Created: 2005-02-02 06:20:45 UTC

Size: 1.19 KB

patch

obsolete

>Index: programs/Xserver/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Imakefile,v
>retrieving revision 1.25
>diff -u -r1.25 Imakefile
>--- programs/Xserver/Imakefile	6 Dec 2004 12:51:42 -0000	1.25
>+++ programs/Xserver/Imakefile	2 Feb 2005 14:13:11 -0000
>@@ -12,6 +12,16 @@
> 
> #include <Server.tmpl>
> 
>+/* On most systems the linker requires the libraries in dependency order. 
>+   But we have no real order because there are cycles. We fix this by adding
>+   some libraries twice on the commandline. dependLib will add the 
>+   dependency library to the commandline if the link order is important */ 
>+#if 1 /* This is currently enabled for all systems */
>+#define dependLib(x) x
>+#else
>+#define dependLib(x)
>+#endif
>+
> #if (defined (XFree86Version) || defined(XorgVersion))
> /* Do not strip server binaries */
> INSTPGMFLAGS = 
>@@ -92,7 +102,7 @@
>           XIDIR = Xi
> #endif
> #if BuildXKB
>-         XKBEXT = xkb/LibraryTargetName(xkb)
>+         XKBEXT = xkb/LibraryTargetName(xkb) dependLib($(OS))
>          XKBDIR = xkb
> #if (defined(XFree86Version) || defined(XorgVersion))
>     XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o

Actions: View | Splinter Review

Attachments on bug 2245: 1645 | 1647 | 1648 | 1649 | 1817

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.