makedepend needs files from x11proto, so it must be build a bit later.

cu,
 Knut
>From f2234ca437e229c4861efe656d03ee36c62ebb67 Mon Sep 17 00:00:00 2001
From: Knut Petersen <knut_peter...@t-online.de>
Date: Mon, 20 Aug 2012 10:42:10 +0200
Subject: [PATCH] fix build order

makedepend requires X11/Xos.h, X11/Xosdefs.h, X11/Xarch.h and
X11/Xfuncproto.h from x11proto, so we must to build it after
x11proto.

Without this patch the xorg build fails or it uses other versions of
these files, most probably taken from /usr/include.

Signed-off-by: Knut Petersen <knut_peter...@t-online.de>
---
 build.sh |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index b2d124b..94ab12f 100755
--- a/build.sh
+++ b/build.sh
@@ -1280,11 +1280,14 @@ if [ X"$MODFILE" = X ]; then
     # We must install the global macros before anything else
     build util macros
     build font util
-    # Required by mesa
+
+    # x11proto is required by makedepend
+    build_proto
+
+    # makedepend is required by mesa
     build util makedepend
 
     build_doc
-    build_proto
     build_lib
     build_mesa
 
-- 
1.7.7

_______________________________________________
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

Reply via email to