From patchwork Wed Aug 6 19:17:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 377374 X-Patchwork-Delegate: kiho@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 B4F381400AA for ; Thu, 7 Aug 2014 05:18:36 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 16ADA3F9B1 for ; Wed, 6 Aug 2014 21:18:36 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by hugin.dotsrc.org (Postfix) with ESMTPS id C42E73FB81 for ; Wed, 6 Aug 2014 21:18:34 +0200 (CEST) Received: by mail-wg0-f46.google.com with SMTP id m15so3111562wgh.17 for ; Wed, 06 Aug 2014 12:18:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oe/78QfP2MtYCWttYrHUhRqOWx73dn712KJcclrxsh4=; b=SXlDnHl0r6N4Gz5xT07hXz34Hns0xUOMzv/DDz4i2I3QAqj8VmVAowH7Gfe8gcZ0Qq 2pmeLpSYCaUB9v3uLV2CN5htuvlzwb0tAtVnnAxdjxR08FwvMHVp0m5V+vy/GJVnJM0L WlSnJRcm1QTjjMjxjPYEB+fHd60khvgO/mEtGgSPuSESHti+yvzF7bLzQlJp4TETJVI7 WFIJFy9mCeWXgIrAqSY4awxW0m7XV/8t6jBQq7ng91/dC6J+SPronk625zcZlTF8Y2Lz xoFNEY6aKsDZKjh5uT0rIWZ4BZ9FseEe7mGuTg4GYeasomms1rW2LaAHMmDLsC3I4U72 7D2A== X-Received: by 10.181.13.112 with SMTP id ex16mr51204044wid.58.1407352714170; Wed, 06 Aug 2014 12:18:34 -0700 (PDT) Received: from localhost.localdomain (mut38-h01-31-33-249-220.dsl.sta.abo.bbox.fr. [31.33.249.220]) by mx.google.com with ESMTPSA id b9sm21033538wic.23.2014.08.06.12.18.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 12:18:33 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 12/18] fontconfig: autoreconf and tests disabled Date: Wed, 6 Aug 2014 21:17:58 +0200 Message-Id: <1407352684-7837-12-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1407352684-7837-1-git-send-email-diorcet.yann@gmail.com> References: <1407352684-7837-1-git-send-email-diorcet.yann@gmail.com> 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: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- .../fontconfig-2.11.0/disable_tests.patch | 44 ++++++++++++++++++++++ recipes/fontconfig/fontconfig.inc | 4 +- recipes/fontconfig/fontconfig_2.11.0.oe | 2 + 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 recipes/fontconfig/fontconfig-2.11.0/disable_tests.patch diff --git a/recipes/fontconfig/fontconfig-2.11.0/disable_tests.patch b/recipes/fontconfig/fontconfig-2.11.0/disable_tests.patch new file mode 100644 index 0000000..b84a4ab --- /dev/null +++ b/recipes/fontconfig/fontconfig-2.11.0/disable_tests.patch @@ -0,0 +1,44 @@ +diff -urN a/configure.ac b/configure.ac +--- a/configure.ac 2013-10-11 06:27:42.000000000 +0200 ++++ b/configure.ac 2014-06-29 21:42:33.702496485 +0200 +@@ -675,6 +675,7 @@ + + AM_CONDITIONAL(USEDOCBOOK, test "x$HASDOCBOOK" = xyes) + ++default_tests="yes" + default_docs="yes" + # + # Check if docs exist or can be created +@@ -687,6 +688,14 @@ + fi + fi + ++AC_ARG_ENABLE(tests, ++ [AC_HELP_STRING([--disable-tests], ++ [Don't build and install tests])], ++ , ++ enable_tests=$default_tests) ++ ++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = xyes) ++ + AC_ARG_ENABLE(docs, + [AC_HELP_STRING([--disable-docs], + [Don't build and install documentation])], +diff -urN a/Makefile.am b/Makefile.am +--- a/Makefile.am 2013-10-11 05:10:16.000000000 +0200 ++++ b/Makefile.am 2014-06-29 21:42:59.133331847 +0200 +@@ -23,10 +23,13 @@ + + SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \ + fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \ +- fc-validate conf.d test ++ fc-validate conf.d + if ENABLE_DOCS + SUBDIRS += doc + endif ++if ENABLE_TESTS ++SUBDIRS += test ++endif + + ACLOCAL_AMFLAGS = -I m4 + diff --git a/recipes/fontconfig/fontconfig.inc b/recipes/fontconfig/fontconfig.inc index 160b6c2..45cd61f 100644 --- a/recipes/fontconfig/fontconfig.inc +++ b/recipes/fontconfig/fontconfig.inc @@ -1,6 +1,6 @@ DESCRIPTION = "A library for configuring and customizing font access." -inherit autotools pkgconfig c++ library +inherit autotools-autoreconf pkgconfig c++ library DEPENDS = "libexpat libfreetype libz" @@ -8,7 +8,7 @@ SRC_URI = "http://fontconfig.org/release/${PN}-${PV}.tar.gz" S = "${SRCDIR}/${PN}-${PV}" -EXTRA_OECONF = "--disable-docs --with-arch=${HOST_ARCH} --with-cache-dir=${localstatedir}/lib/${PN}" +EXTRA_OECONF = "--disable-docs --disable-tests --with-arch=${HOST_ARCH} --with-cache-dir=${localstatedir}/lib/${PN}" do_configure_extra_MAKEFILES = "fc-case/Makefile fc-glyphname/Makefile \ fc-lang/Makefile fc-arch/Makefile" diff --git a/recipes/fontconfig/fontconfig_2.11.0.oe b/recipes/fontconfig/fontconfig_2.11.0.oe index 22409a1..bae880c 100644 --- a/recipes/fontconfig/fontconfig_2.11.0.oe +++ b/recipes/fontconfig/fontconfig_2.11.0.oe @@ -1,6 +1,8 @@ require ${PN}.inc LICENSE = "BSD" +SRC_URI += "file://disable_tests.patch" + EXTRA_OECONF += "--without-xmldir" do_configure_extra_MAKEFILES = "fc-case/Makefile fc-glyphname/Makefile \