Patchwork [06/11] xorg: Remove use of autoreconf and rely on the configure files we get with the packages.

login
register
mail settings
Submitter Morten Svendsen
Date Dec. 19, 2012, 10:05 a.m.
Message ID <85dc1d2ef43bebcefdd3f2213805a709594ba898.1355911420.git.morten.thunbergsvendsen@prevas.dk>
Download mbox | patch
Permalink /patch/207293/
State Accepted
Delegated to: Jacob Kjaergaard
Headers show

Comments

Morten Svendsen - Dec. 19, 2012, 10:05 a.m.
End result is more independents on build host
---
 recipes/xorg-app/xorg-app-common.inc             | 2 +-
 recipes/xorg-driver/mtdev_1.1.2.oe               | 2 +-
 recipes/xorg-driver/xf86-video-imxfb_11.09.01.oe | 3 +--
 recipes/xorg-lib/libx11.inc                      | 7 +++++++
 recipes/xorg-proto/fixesproto_5.0.oe             | 1 +
 recipes/xorg-util/xorg-util-common.inc           | 2 +-
 recipes/xorg-xserver/xserver-xorg-common.inc     | 2 +-
 7 files changed, 13 insertions(+), 6 deletions(-)

Patch

diff --git a/recipes/xorg-app/xorg-app-common.inc b/recipes/xorg-app/xorg-app-common.inc
index 3c8415b..71e1a30 100644
--- a/recipes/xorg-app/xorg-app-common.inc
+++ b/recipes/xorg-app/xorg-app-common.inc
@@ -9,6 +9,6 @@  SRC_URI = "${XORG_MIRROR}/individual/app/${PN}-${PV}.tar.bz2"
 
 S = "${SRCDIR}/${PN}-${PV}"
 
-inherit autotools-autoreconf pkgconfig c++
+inherit autotools pkgconfig c++
 
 FILES_${PN} += "  /usr/lib/X11/${PN} /usr/share/X11/app-defaults/"
diff --git a/recipes/xorg-driver/mtdev_1.1.2.oe b/recipes/xorg-driver/mtdev_1.1.2.oe
index 2307d57..0000421 100644
--- a/recipes/xorg-driver/mtdev_1.1.2.oe
+++ b/recipes/xorg-driver/mtdev_1.1.2.oe
@@ -1,6 +1,6 @@ 
 DESCRIPTION = "The mtdev is a stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol. The events put into mtdev may be from any MT device, specifically type A without contact tracking, type A with contact tracking, or type B with contact tracking. See the kernel documentation for further details."
 LICENSE = "MIT"
 
-inherit autotools-autoreconf pkgconfig
+inherit autotools pkgconfig
 
 SRC_URI = "http://bitmath.org/code/mtdev/mtdev-${PV}.tar.bz2"
diff --git a/recipes/xorg-driver/xf86-video-imxfb_11.09.01.oe b/recipes/xorg-driver/xf86-video-imxfb_11.09.01.oe
index c491729..bf12f79 100644
--- a/recipes/xorg-driver/xf86-video-imxfb_11.09.01.oe
+++ b/recipes/xorg-driver/xf86-video-imxfb_11.09.01.oe
@@ -6,8 +6,7 @@  LICENSE = "MIT-X"
 RDEPENDS_${PN} = "amd-gpu-x11-bin-mx51"
 DEPENDS = "xserver-xorg libx11 xproto renderproto videoproto randrproto util-macros amd-gpu-x11-bin-mx51 fontsproto pixman xextproto inputproto libpciaccess libz160"
 
-inherit autotools-autoreconf pkgconfig
-
+inherit autotools pkgconfig
 SRC_URI = "file://xserver-xorg-video-imx-${PV}.tar.gz \
            file://xf86-video-imxfb-fix-m4-hardcodded-paths.patch \
 	   file://mfloat-toolchain-decides.patch \
diff --git a/recipes/xorg-lib/libx11.inc b/recipes/xorg-lib/libx11.inc
index 59667b0..ae13eaf 100644
--- a/recipes/xorg-lib/libx11.inc
+++ b/recipes/xorg-lib/libx11.inc
@@ -6,6 +6,8 @@  basic functions of the window system."
 
 require xorg-lib-common.inc
 
+# reconf packaged configure uses pkg-config --variable to get
+# includepath for keysyms.h. Result: No PKGCONFIG_SYSROOT prefix.
 inherit siteinfo autotools-autoreconf
 
 
@@ -16,6 +18,11 @@  DEPENDS += "util-macros"
 PROVIDES_${PN} = "x11" 
 
 EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
+AUTORECONF = "${LIBTOOLIZE} --force --automake --copy \
+&& aclocal $acpaths --force \
+&& autoconf $acpaths --force \
+&& automake -a --copy --force; \
+"
 
 PACKAGES =+ "${PN}-xcb"
 
diff --git a/recipes/xorg-proto/fixesproto_5.0.oe b/recipes/xorg-proto/fixesproto_5.0.oe
index f8e2af0..4582c70 100644
--- a/recipes/xorg-proto/fixesproto_5.0.oe
+++ b/recipes/xorg-proto/fixesproto_5.0.oe
@@ -14,3 +14,4 @@  LICENSE = "MIT & MIT-style"
 
 RECIPE_TYPES = "sdk machine"
 
+DEPENDS_${PN} += "xextproto"
diff --git a/recipes/xorg-util/xorg-util-common.inc b/recipes/xorg-util/xorg-util-common.inc
index 67ed401..a484a2a 100644
--- a/recipes/xorg-util/xorg-util-common.inc
+++ b/recipes/xorg-util/xorg-util-common.inc
@@ -10,4 +10,4 @@  SRC_URI = "${XORG_MIRROR}/individual/util/${XORG_PN}-${PV}.tar.gz"
 
 S = "${SRCDIR}/${XORG_PN}-${PV}"
 
-inherit autotools-autoreconf pkgconfig
+inherit autotools pkgconfig
diff --git a/recipes/xorg-xserver/xserver-xorg-common.inc b/recipes/xorg-xserver/xserver-xorg-common.inc
index 7b1781c..c85e751 100644
--- a/recipes/xorg-xserver/xserver-xorg-common.inc
+++ b/recipes/xorg-xserver/xserver-xorg-common.inc
@@ -19,7 +19,7 @@  SRC_URI += "file://macro_tweak.patch"
 
 S = "${SRCDIR}/${XORG_PN}-${PV}"
 
-inherit autotools-autoreconf pkgconfig
+inherit autotools pkgconfig
 
 PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"