diff options
author | Ross Burton <ross.burton@intel.com> | 2012-11-06 12:32:35 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-12 13:36:37 +0000 |
commit | e828faf027540bc5def8b7371a959884caad9557 (patch) | |
tree | f002db7574c02d585950e8bc0d2fa897095845d4 /meta | |
parent | 7ea8496ce085d507166efbd3a5e4d20444d3c35f (diff) | |
download | poky-e828faf027540bc5def8b7371a959884caad9557.tar.gz |
xorg-driver-common: remove AC_CHECK_FILE workaround
The drivers don't generally use AC_CHECK_FILE anymore, so remove this
brute-force kludge. Any subsequent breakage can be worked-around in the recipe
and fixes submitted upstream.
(From OE-Core rev: 1b0d9cb1801a8eb68c82dfcda5a1da420ac8dd83)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index f9f25ffe95..d2c9a5f453 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | |||
@@ -5,7 +5,7 @@ SECTION = "x11/drivers" | |||
5 | LICENSE = "MIT-X" | 5 | LICENSE = "MIT-X" |
6 | 6 | ||
7 | PE = "2" | 7 | PE = "2" |
8 | INC_PR = "r18" | 8 | INC_PR = "r19" |
9 | 9 | ||
10 | DEPENDS = "virtual/xserver xproto randrproto util-macros" | 10 | DEPENDS = "virtual/xserver xproto randrproto util-macros" |
11 | 11 | ||
@@ -18,14 +18,6 @@ FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" | |||
18 | 18 | ||
19 | inherit autotools pkgconfig | 19 | inherit autotools pkgconfig |
20 | 20 | ||
21 | # AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement | ||
22 | # macro that simply assumes the test succeeds. | ||
23 | do_configure_prepend () { | ||
24 | echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new | ||
25 | sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new | ||
26 | mv configure.ac.new configure.ac | ||
27 | } | ||
28 | |||
29 | # FIXME: We don't want to include the libtool archives (*.la) from modules | 21 | # FIXME: We don't want to include the libtool archives (*.la) from modules |
30 | # directory, as they serve no useful purpose. Upstream should fix Makefile.am | 22 | # directory, as they serve no useful purpose. Upstream should fix Makefile.am |
31 | do_install_append() { | 23 | do_install_append() { |