From patchwork Wed Dec 19 10:05:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morten Svendsen X-Patchwork-Id: 207293 X-Patchwork-Delegate: jacob.kjaergaard@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id D4F592C0094 for ; Wed, 19 Dec 2012 21:06:42 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 933193F98D for ; Wed, 19 Dec 2012 11:06:41 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id C6D5A3F98D for ; Wed, 19 Dec 2012 11:06:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=4746; q=dns/txt; s=ironport2; t=1355911599; x=1387447599; h=from:to:subject:date:message-id:in-reply-to:references: mime-version; bh=9TBMdQUhmHF9hUcJGiwhgQnbKTNnlXXjYmHRJ07nhjU=; b=nQtHcDH62MK3exdwFWAcEfy3iG0gUMs8Pij9DZhRO8xOqiHRrDL7Xr6A Gg1HhLLHkpS1wD65VLzyKm/3F0W63VVv2Jv2OPuOv1jPmlwkXOgsevmAF 6plDjK8gtN78FvP7sihiANPz8UyBSGtsGM5258M+7oZeOAzeGMIiIryPw 8=; X-IronPort-AV: E=Sophos;i="4.84,313,1355094000"; d="scan'208";a="1951356" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 19 Dec 2012 11:05:32 +0100 Received: from fire.prevas.dk (172.16.10.61) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.318.4; Wed, 19 Dec 2012 11:05:32 +0100 From: Morten Thunberg Svendsen To: Subject: [PATCH 06/11] xorg: Remove use of autoreconf and rely on the configure files we get with the packages. Date: Wed, 19 Dec 2012 11:05:19 +0100 Message-ID: <85dc1d2ef43bebcefdd3f2213805a709594ba898.1355911420.git.morten.thunbergsvendsen@prevas.dk> X-Mailer: git-send-email 1.8.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.16.10.61] X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org 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(-) 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"