util-macros: Unbreak cross-compiling

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1238 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/xorg-util/files/unbreak_cross_compile.patch b/meta/packages/xorg-util/files/unbreak_cross_compile.patch
new file mode 100644 (file)
index 0000000..fd84aad
--- /dev/null
+++ b/meta/packages/xorg-util/files/unbreak_cross_compile.patch
@@ -0,0 +1,26 @@
+---
+ xorg-macros.m4.in |    4 ----
+ 1 file changed, 4 deletions(-)
+
+Index: util-macros-1.1.5/xorg-macros.m4.in
+===================================================================
+--- util-macros-1.1.5.orig/xorg-macros.m4.in   2006-11-08 14:23:10.000000000 +0000
++++ util-macros-1.1.5/xorg-macros.m4.in        2007-01-31 15:28:55.000000000 +0000
+@@ -194,8 +194,6 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
+ XORG_SGML_PATH=$prefix/share/sgml
+ HAVE_DEFS_ENT=
+ 
+-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+-
+ AC_PATH_PROG(LINUXDOC, linuxdoc)
+ AC_PATH_PROG(PS2PDF, ps2pdf)
+ 
+@@ -250,8 +248,6 @@ BUILDPDFDOC=no
+ BUILDPSDOC=no
+ BUILDHTMLDOC=no
+ 
+-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+-
+ AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+ AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
+ AC_PATH_PROG(DOCBOOKHTML, docbook2html)

diff --git a/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb b/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb
index 9603498..06dd0a5 100644 (file)
--- a/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb
+++ b/meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb
@@ -2,6 +2,9 @@ require xorg-util-common.inc
 
 DESCRIPTION = "X autotools macros"
 
-SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz"
+PR = "r1"
+
+SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \
+           file://unbreak_cross_compile.patch;patch=1 "
 S = "${WORKDIR}/${XORG_PN}-1.1.5"