Fixes automake bug#12934 a.k.a. bug#12522.
Some of automake's Vala tests used to rely on "valac --profile posix"
(which makes it not use glib). However, the posix profile was removed
in August 2012, and is no longer present in the GNOME 3.6.2 version
of valac (see commit
ca020bf0 in the vala Git repository).
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* t/vala-libs.sh: Adjust to avoid using the posix profile.
* t/vala-mix.sh: Likewise.
* t/vala-mix2.sh: Likewise.
* t/vala-parallel.sh: Likewise.
* t/vala-vapi.sh: Likewise.
* t/vala-vpath.sh: Likewise.
* NEWS: Update and adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Bugs fixed in 1.12.6:
-* Bugs introduced in 1.12.5:
-
- - The maintainer rebuild rules for Makefiles and aclocal.m4 in Automake's
- own build system works correctly again.
-
-* Long-standing bugs:
+* Python-related bugs:
- The default installation location for python modules has been improved
for Python 3 on Debian and Ubuntu systems, changing from:
- Python byte-compilation supports the new layout mandated by PEP-3147,
with its __pycache__ directory (automake bug#8847).
+* Build system issues:
+
+ - The maintainer rebuild rules for Makefiles and aclocal.m4 in
+ Automake's own build system works correctly again (bug introduced
+ in Automake 1.12.5).
+
+* Testsuite issues:
+
+ - The Vala-related tests has been changed to adjust to the removal of
+ the 'posix' profile in the valac compiler. See automake bug#12934
+ a.k.a. bug#12522.
+
+ - Some spurious testsuite failures related to older tools and systems
+ have been fixed.
+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.12.5:
lib_LTLIBRARIES = src/libzardoz.la
libmu_a_SOURCES = mu.vala mu2.c mu.vapi mu2.h
libmu_a_CPPFLAGS = -DOKOKIMDEFINED=1
-libmu_a_VALAFLAGS = --profile=posix --vapidir=$(srcdir)
+libmu_a_VALAFLAGS = --vapidir=$(srcdir)
AM_CFLAGS = $(GOBJECT_CFLAGS)
src_libzardoz_la_LIBADD = $(GOBJECT_LIBS)
src_libzardoz_la_SOURCES = src/zardoz-foo.vala src/zardoz-bar.vala
# Vala sources and C sources in the same program. Functional test.
-required='valac cc GNUmake'
+required='valac cc pkg-config GNUmake'
. test-init.sh
cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_VALAC([0.7.3])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
AC_OUTPUT
END
cat > Makefile.am <<'END'
bin_PROGRAMS = zardoz mu baz
-AM_VALAFLAGS = --profile=posix
+AM_CFLAGS = $(GOBJECT_CFLAGS)
+LDADD = $(GOBJECT_LIBS)
zardoz_SOURCES = foo.vala bar.c
mu_SOURCES = 1.vala 2.c
-mu_VALAFLAGS = $(AM_VALAFLAGS) --main=run
-mu_CFLAGS = -DHAVE_MU
+mu_VALAFLAGS = --main=run
+mu_CFLAGS = -DHAVE_MU $(AM_CFLAGS)
baz_SOURCES = baz.c
END
# Vala sources, C and C++ sources and C and C++ headers in the same
# program. Functional test. See automake bug#10894.
-required='valac cc c++ GNUmake'
+required='valac cc c++ pkg-config GNUmake'
. test-init.sh
cat >> configure.ac <<'END'
AC_PROG_CC
AC_PROG_CXX
AM_PROG_VALAC([0.7.3])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
AC_OUTPUT
END
cat > Makefile.am <<'END'
bin_PROGRAMS = zardoz
-AM_VALAFLAGS = --profile=posix
+AM_CFLAGS = $(GOBJECT_CFLAGS)
+zardoz_LDADD = $(GOBJECT_LIBS)
zardoz_SOURCES = zardoz.vala foo.h bar.c baz.c zen.hh master.cxx
END
# Vala support with parallel make.
-required='valac cc GNUmake'
+required='valac cc pkg-config GNUmake'
. test-init.sh
cat >> configure.ac <<'END'
AC_PROG_CC
AC_PROG_CXX
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
AM_PROG_VALAC([0.7.3])
AC_OUTPUT
END
cat > Makefile.am <<'END'
bin_PROGRAMS = zardoz
-AM_VALAFLAGS = --profile=posix
+AM_CFLAGS = $(GOBJECT_CFLAGS)
+LDADD = $(GOBJECT_LIBS)
zardoz_SOURCES = main.vala 1.vala 2.vala 3.vala 4.vala 5.vala 6.vala
END
# Test and that vapi files are correctly handled by Vala support.
-required='valac cc GNUmake'
+required='pkg-config valac cc GNUmake'
. test-init.sh
cat >> configure.ac <<'END'
AC_PROG_CC
AM_PROG_CC_C_O
AM_PROG_VALAC([0.7.3])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
AC_OUTPUT
END
cat > Makefile.am <<'END'
bin_PROGRAMS = zardoz
-AM_VALAFLAGS = --profile=posix
+AM_CFLAGS = $(GOBJECT_CFLAGS)
+LDADD = $(GOBJECT_LIBS)
zardoz_SOURCES = zardoz.vala foo.vapi foo.h
END
cat > zardoz.vala <<'END'
-int main ()
-{
+using GLib;
+public class Zardoz {
+ public static void main () {
stdout.printf (BARBAR);
- return 0;
+ }
}
END
# Test to make sure vala support handles from-scratch VPATH builds.
# See automake bug#8753.
-required="cc valac GNUmake"
+required="cc valac pkg-config GNUmake"
. test-init.sh
cat >> configure.ac << 'END'
AC_CONFIG_SRCDIR([hello.vala])
AC_PROG_CC
AM_PROG_VALAC([0.7.3])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
AC_OUTPUT
END
cat > Makefile.am <<'END'
bin_PROGRAMS = foo bar
-AM_VALAFLAGS = --profile=posix
+AM_CFLAGS = $(GOBJECT_CFLAGS)
+LDADD = $(GOBJECT_LIBS)
foo_SOURCES = hello.vala
-bar_VALAFLAGS = $(AM_VALAFLAGS) -H zardoz.h
+bar_VALAFLAGS = -H zardoz.h
bar_SOURCES = goodbye.vala
END