[12/18] fontconfig: autoreconf and tests disabled

Submitted by Yann Diorcet on Aug. 6, 2014, 7:17 p.m.

Details

Message ID 1407352684-7837-12-git-send-email-diorcet.yann@gmail.com
State Under Review
Delegated to: Kim
Headers show

Commit Message

Yann Diorcet Aug. 6, 2014, 7:17 p.m.
---
 .../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

Patch hide | download patch | download mbox

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 \