As part of pulling in the more generic components of the meta-intel
xserver infrastructure, include the configure and install appends from
the meta-intel version of xorg-driver-common.
Modify the configure prepend to use ${S} in the paths explicitly as
without this the script appears to be running in a build/ directory
instead of the source directory, and cannot find the configure.ac.
This prepend is required for at least the -intel and -mga drivers.
Signed-off-by: Darren Hart <[email protected]>
Cc: Ross Burton <[email protected]>
Cc: Nitin A Kamble <[email protected]>
---
.../xorg-driver/xorg-driver-common.inc | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index 5f5d282..2d4f2ce 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 = "r21"
+INC_PR = "r22"
DEPENDS = "virtual/xserver xproto randrproto util-macros"
@@ -39,3 +39,18 @@ def add_abi_depends(d, name):
pn = d.getVar("PN", True)
d.appendVar('RDEPENDS_' + pn, ' ' + abi)
+
+# AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
+# macro that simply assumes the test succeeds. This is required for at least
+# the -intel and -mga drivers.
+do_configure_prepend () {
+ echo 'AC_DEFUN(CC_AC_CHECK_FILE, $2)' > ${S}/configure.ac.new
+ sed 's/AC_CHECK_FILE/CC_AC_CHECK_FILE/g' ${S}/configure.ac >>
${S}/configure.ac.new
+ mv ${S}/configure.ac.new ${S}/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() {
+ find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
+}
--
1.7.9.5
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
