aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xorg-xserver
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2009-06-07 00:37:02 +0200
committerAndrea Adami <andrea.adami@gmail.com>2009-06-07 00:37:02 +0200
commit595a0174db40089ad992bb054c6e694957f35042 (patch)
treefe91910ff786760dd837122844e4c90444307298 /recipes/xorg-xserver
parentf999f6777d4dcbd5a65a96e7cd04a72dff5d2ef1 (diff)
downloadopenembedded-595a0174db40089ad992bb054c6e694957f35042.tar.gz
xserver-kdrive-imageon_1.2.0: fix AC_SUBST in configure.ac
- AC_SUBST is documented to only take one variable - was breaking with autotools_2.63 - bump PR
Diffstat (limited to 'recipes/xorg-xserver')
-rw-r--r--recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch15
-rw-r--r--recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb5
2 files changed, 18 insertions, 2 deletions
diff --git a/recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch b/recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch
new file mode 100644
index 0000000000..dfbe730613
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.2.0/split_multiple_AC_SUBST.patch
@@ -0,0 +1,15 @@
+Index: xorg-server-1.2.0/configure.ac
+===================================================================
+--- xorg-server-1.2.0.orig/configure.ac 2007-12-12 20:57:37.000000000 +0100
++++ xorg-server-1.2.0/configure.ac 2009-06-06 23:47:54.000000000 +0200
+@@ -1667,7 +1667,9 @@
+ DIX_CFLAGS="-DHAVE_DIX_CONFIG_H"
+ AC_SUBST([DIX_CFLAGS])
+
+-AC_SUBST([libdir exec_prefix prefix])
++AC_SUBST([libdir])
++AC_SUBST([exec_prefix])
++AC_SUBST([prefix])
+
+ # Man page sections - used in config utils & generating man pages
+ XORG_MANPAGE_SECTIONS
diff --git a/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
index 3a042db0d1..18b85fdcb0 100644
--- a/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
+++ b/recipes/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
@@ -7,7 +7,7 @@ DEPENDS += "libxkbfile libxcalibrate"
PROVIDES = "virtual/xserver"
PE = "1"
-PR = "r6"
+PR = "r7"
FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-${PV}:${FILE_DIRNAME}/xserver-kdrive:${FILE_DIRNAME}/files"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -22,7 +22,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://xcalibrate_coords.patch;patch=1 \
file://enable-builtin-fonts.patch;patch=1 \
file://fix-picturestr-include-order.patch;patch=1 \
- "
+ file://split_multiple_AC_SUBST.patch;patch=1 \
+ "
S = "${WORKDIR}/xorg-server-${PV}"