Attached are some more patches for cross-compiling.
For libpciaccess:
0001-Fix-crosscompiling-by-using-AC_CHECK_HEADER-instead.patch
For libX11
0001-Get-libX11-to-work-when-cross-compiling.patch
John
2008/9/4 John Tapsell <[EMAIL PROTECTED]>:
> Hi all,
>
> The first patch applies to xorg/xserver and replaces the
> requirement of openssl with an internal SHA1 implementation. The SHA1
> code is the code that openbsd uses and is public domain.
>
> The second patch also applies to xorg/xserver and remove's the
> pixclock check. The commit message goes into the details.
>
> The third patch applies to xorg/util/modules and updates the
> dependencies. The added dependencies are based upon the dependencies
> in the configure checks.
>
>
> Could someone applies these for me - thanks.
>
> John Tapsell
>
From e5a2278afbc4a89c3a072c6fa3f85dcb877893ef Mon Sep 17 00:00:00 2001
From: John Tapsell <[EMAIL PROTECTED](none)>
Date: Mon, 1 Sep 2008 17:56:38 +0100
Subject: [PATCH] Fix crosscompiling by using AC_CHECK_HEADER instead
---
configure.ac | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 67b18f4..8d97ae2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,8 +104,8 @@ AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes])
AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes])
AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes])
-AC_CHECK_FILE([/usr/include/asm/mtrr.h],
- [have_mtrr_h="yes"], [have_mtrr_h="no"])
+AC_CHECK_HEADER([asm/mtrr.h], [have_mtrr_h="yes"], [have_mtrr_h="no"])
+
if test "x$have_mtrr_h" = xyes; then
AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings])
fi
--
1.5.4.3
From 7089a4b0fd9eac9284a0b28f841e5b7df01727aa Mon Sep 17 00:00:00 2001
From: John Tapsell <[EMAIL PROTECTED](none)>
Date: Mon, 1 Sep 2008 14:44:52 +0100
Subject: [PATCH] Get libX11 to work when cross-compiling
---
configure.ac | 6 ++++++
src/util/Makefile.am | 3 +--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6be37b2..8363798 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,12 @@ XORG_MACROS_VERSION(1.1)
AC_PROG_LIBTOOL
AC_PROG_CC
+if test x"$cross_compiling" = xyes; then
+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
+else
+ CC_FOR_BUILD="$CC"
+fi
+
XORG_PROG_RAWCPP
# Build with XCB support?
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 3ff421d..c9e81c0 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -4,8 +4,7 @@ noinst_PROGRAMS=makekeys
makekeys_CFLAGS=$(X11_CFLAGS)
-#override CC = gcc
-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CC = @CC_FOR_BUILD@
EXTRA_DIST = mkks.sh
--
1.5.4.3
_______________________________________________
xorg mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xorg
