On 06/12/2010 22:53, James Jones wrote:
> As a precursor to the fence sync object video driver
> and extension API, move some code from Xext to
> miext/sync. Most of this is just code to set up the
> build system to include the new directory. No
> functional code is added in this change.
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1889,7 +1891,7 @@ if test "x$XWIN" = xyes; then
> XWIN_SYS_LIBS=-lwinsock2
> ;;
> esac
> - XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB
> $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB
> $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"
> + XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $RANDR_LIB
> $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB
> $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB
> $OS_LIB"
> XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"
> AC_SUBST(XWIN_LIBS)
> AC_SUBST(XWIN_SERVER_NAME)
This breaks the XWin build, see [1]
I'm assuming the removal of $RENDER_LIB and addition of $CONFIG_LIB here is a
mistake, as everything else just gets $MIEXT_SYNC_LIB added.
Trivial patch to fix attached.
[1] http://tinderbox.freedesktop.org/builds/2010-12-07-0013/logs/xserver/#build
>From 0fa8e08d2f103c9637a3e9a5ef8c6c1753a0f8f2 Mon Sep 17 00:00:00 2001
From: Jon TURNEY <jon.tur...@dronecode.org.uk>
Date: Wed, 8 Dec 2010 18:50:45 +0000
Subject: [PATCH] Fix Xwin build after af0f9f91
Fix damage to XWIN_LIBS in commit af0f9f913398d34a885c3fb4e8d40c1a7e2b3ee9
"Move some sync code to miext", which broke the XWin build
Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index b56d3e8..79dc119 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1888,7 +1888,7 @@ if test "x$XWIN" = xyes; then
XWIN_SYS_LIBS=-lwinsock2
;;
esac
- XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $RANDR_LIB
$DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB
$DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"
+ XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB
$DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB
$DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"
XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"
AC_SUBST(XWIN_LIBS)
AC_SUBST(XWIN_SERVER_NAME)
--
1.7.2.3
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
