123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117 |
- Add a --disable-tests option to the configure script
- Disabling the build of tests has two benefits:
- * Prevents the build of a lot of code that doesn't build on noMMU
- platforms.
- * Reduces the build time.
- Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
- Index: libglib2-2.30.3/Makefile.am
- ===================================================================
- --- libglib2-2.30.3.orig/Makefile.am 2012-03-11 22:43:28.000000000 +0100
- +++ libglib2-2.30.3/Makefile.am 2013-03-09 17:32:01.000000000 +0100
- @@ -6,7 +6,11 @@
-
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
-
- -SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
- +if BUILD_TESTS
- +TEST_SUBDIR = tests
- +endif
- +
- +SUBDIRS = . m4macros glib gmodule gthread gobject gio $(TEST_SUBDIR) po docs
- DIST_SUBDIRS = $(SUBDIRS) build
-
- bin_SCRIPTS = glib-gettextize
- Index: libglib2-2.30.3/gio/Makefile.am
- ===================================================================
- --- libglib2-2.30.3.orig/gio/Makefile.am 2012-03-11 22:44:19.000000000 +0100
- +++ libglib2-2.30.3/gio/Makefile.am 2013-03-09 17:32:38.000000000 +0100
- @@ -282,7 +282,11 @@
-
- endif
-
- -SUBDIRS += tests
- +if BUILD_TESTS
- +TEST_SUBDIR = tests
- +endif
- +
- +SUBDIRS += $(TEST_SUBDIR)
-
- libgio_2_0_la_SOURCES = \
- gappinfo.c \
- Index: libglib2-2.30.3/configure.ac
- ===================================================================
- --- libglib2-2.30.3.orig/configure.ac 2013-03-09 17:30:55.000000000 +0100
- +++ libglib2-2.30.3/configure.ac 2013-03-09 17:37:27.000000000 +0100
- @@ -234,11 +234,18 @@
- [AC_HELP_STRING([--disable-rebuilds],
- [disable all source autogeneration rules])],,
- [enable_rebuilds=yes])
- +AC_ARG_ENABLE(tests,
- + [AC_HELP_STRING([--disable-tests],
- + [disable all tests])],
- + enable_tests=${enableval},
- + enable_tests=yes)
-
- if test "x$enable_threads" != "xyes"; then
- enable_threads=no
- fi
-
- +AM_CONDITIONAL(BUILD_TESTS, [test x$enable_tests = xyes])
- +
- AC_MSG_CHECKING([whether to enable garbage collector friendliness])
- if test "x$enable_gc_friendly" = "xyes"; then
- AC_DEFINE(ENABLE_GC_FRIENDLY_DEFAULT, 1, [Whether to enable GC friendliness by default])
- Index: libglib2-2.30.3/glib/Makefile.am
- ===================================================================
- --- libglib2-2.30.3.orig/glib/Makefile.am 2012-03-11 22:43:28.000000000 +0100
- +++ libglib2-2.30.3/glib/Makefile.am 2013-03-09 18:02:59.000000000 +0100
- @@ -42,7 +42,11 @@
- gregex_h =
- endif
-
- -SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
- +if BUILD_TESTS
- +TEST_SUBDIR = tests
- +endif
- +
- +SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . $(TEST_SUBDIR)
-
- DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
-
- Index: libglib2-2.30.3/gobject/Makefile.am
- ===================================================================
- --- libglib2-2.30.3.orig/gobject/Makefile.am 2012-03-11 22:43:29.000000000 +0100
- +++ libglib2-2.30.3/gobject/Makefile.am 2013-03-09 18:03:40.000000000 +0100
- @@ -4,7 +4,11 @@
- ## Process this file with automake to produce Makefile.in
- include $(top_srcdir)/Makefile.decl
-
- -SUBDIRS = . tests
- +if BUILD_TESTS
- +TEST_SUBDIR = tests
- +endif
- +
- +SUBDIRS = . $(TEST_SUBDIR)
-
- BUILT_SOURCES=
- CLEANFILES=
- Index: libglib2-2.30.3/gthread/Makefile.am
- ===================================================================
- --- libglib2-2.30.3.orig/gthread/Makefile.am 2012-03-11 22:43:29.000000000 +0100
- +++ libglib2-2.30.3/gthread/Makefile.am 2013-03-09 18:04:16.000000000 +0100
- @@ -1,7 +1,11 @@
- ## Process this file with automake to produce Makefile.in
- include $(top_srcdir)/Makefile.decl
-
- -SUBDIRS = . tests
- +if BUILD_TESTS
- +TEST_SUBDIR = tests
- +endif
- +
- +SUBDIRS = . $(TEST_SUBDIR)
- DIST_SUBDIRS = tests
-
- AM_CPPFLAGS = \
|