summaryrefslogtreecommitdiffstats
path: root/meta/packages/xorg-util
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/xorg-util')
-rw-r--r--meta/packages/xorg-util/files/unbreak_cross_compile.patch26
-rw-r--r--meta/packages/xorg-util/util-macros_X11R7.1-1.1.5.bb5
2 files changed, 30 insertions, 1 deletions
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
index 0000000000..fd84aade1e
--- /dev/null
+++ b/meta/packages/xorg-util/files/unbreak_cross_compile.patch
@@ -0,0 +1,26 @@
1---
2 xorg-macros.m4.in | 4 ----
3 1 file changed, 4 deletions(-)
4
5Index: util-macros-1.1.5/xorg-macros.m4.in
6===================================================================
7--- util-macros-1.1.5.orig/xorg-macros.m4.in 2006-11-08 14:23:10.000000000 +0000
8+++ util-macros-1.1.5/xorg-macros.m4.in 2007-01-31 15:28:55.000000000 +0000
9@@ -194,8 +194,6 @@ AC_DEFUN([XORG_CHECK_LINUXDOC],[
10 XORG_SGML_PATH=$prefix/share/sgml
11 HAVE_DEFS_ENT=
12
13-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
14-
15 AC_PATH_PROG(LINUXDOC, linuxdoc)
16 AC_PATH_PROG(PS2PDF, ps2pdf)
17
18@@ -250,8 +248,6 @@ BUILDPDFDOC=no
19 BUILDPSDOC=no
20 BUILDHTMLDOC=no
21
22-AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
23-
24 AC_PATH_PROG(DOCBOOKPS, docbook2ps)
25 AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
26 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 9603498def..06dd0a5d73 100644
--- 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
2 2
3DESCRIPTION = "X autotools macros" 3DESCRIPTION = "X autotools macros"
4 4
5SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz" 5PR = "r1"
6
7SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-1.1.5.tar.gz \
8 file://unbreak_cross_compile.patch;patch=1 "
6S = "${WORKDIR}/${XORG_PN}-1.1.5" 9S = "${WORKDIR}/${XORG_PN}-1.1.5"
7 10