Patchwork xorg-driver-common: remove AC_CHECK_FILE workaround

login
register
mail settings
Submitter Ross Burton
Date Nov. 6, 2012, 12:32 p.m.
Message ID <1352205155-32744-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/38799/
State Accepted
Commit 1b0d9cb1801a8eb68c82dfcda5a1da420ac8dd83
Headers show

Comments

Ross Burton - Nov. 6, 2012, 12:32 p.m.
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-driver/xorg-driver-common.inc |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Patch

diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index f9f25ff..d2c9a5f 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"
 LICENSE = "MIT-X"
 
 PE = "2"
-INC_PR = "r18"
+INC_PR = "r19"
 
 DEPENDS = "virtual/xserver xproto randrproto util-macros"
 
@@ -18,14 +18,6 @@  FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
 
 inherit autotools pkgconfig
 
-# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
-# macro that simply assumes the test succeeds. 
-do_configure_prepend () {
-    echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > configure.ac.new
-    sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' configure.ac >> configure.ac.new
-    mv configure.ac.new configure.ac
-}
-
 # FIXME: We don't want to include the libtool archives (*.la) from modules
 # directory, as they serve no useful purpose. Upstream should fix Makefile.am
 do_install_append() {