From patchwork Mon Jan 5 15:04:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kim.hansen@prevas.dk X-Patchwork-Id: 425355 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 6C53C1400B7 for ; Tue, 6 Jan 2015 02:05:01 +1100 (AEDT) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 6FF5F3FB3C for ; Mon, 5 Jan 2015 16:04:59 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 9DF423FB3C for ; Mon, 5 Jan 2015 16:04:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=4570; q=dns/txt; s=ironport1; t=1420470297; x=1452006297; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=tQ5+jAsh3rMgOMM0Fl+jR3X2Did65RQOa1GjR/u5fqM=; b=rJce2cbCPtaXjor+DqU+qphQiyXEfpc+fEPCnuvDqdYs0jP3CEJcQIhA 5rP8LieStGsN8LmrzR/ali+opHhrz9YnB5HKGBQFN6CPbwD5qud26yj0p 5M9mmoK1AZjyApQTgGn/tEkNMroQEoHf65iyBVTAMt0iMufbKhk/rZtTR w=; X-IronPort-AV: E=Sophos;i="5.07,700,1413237600"; d="scan'208";a="5472492" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 05 Jan 2015 16:04:57 +0100 Received: from VMPREVAS2.prevas.se ([fe80::ddc4:1ca4:65e1:d098]) by VMPREVAS3.prevas.se ([172.16.8.103]) with mapi id 14.02.0387.000; Mon, 5 Jan 2015 16:04:57 +0100 From: =?iso-8859-1?Q?Kim_H=F8jgaard-Hansen?= To: Yann Diorcet , "dev@oe-lite.org" Subject: SV: [PATCH 12/18] fontconfig: autoreconf and tests disabled Thread-Topic: [PATCH 12/18] fontconfig: autoreconf and tests disabled Thread-Index: AQHPsas5pK2aypaYqEiGtL863jouRpyyjkxy Date: Mon, 5 Jan 2015 15:04:56 +0000 Message-ID: References: <1407352684-7837-1-git-send-email-diorcet.yann@gmail.com>, <1407352684-7837-12-git-send-email-diorcet.yann@gmail.com> In-Reply-To: <1407352684-7837-12-git-send-email-diorcet.yann@gmail.com> Accept-Language: da-DK, sv-SE, en-US Content-Language: da-DK X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.16.11.37] MIME-Version: 1.0 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 how does it fail without this fix? It seems like something that might have a chance of being pushed upstream. Would like to know if that has been tried. /Kim 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 \