[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.5-21-
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.5-21-g54ec1e6 |
|
Date: |
Mon, 26 Nov 2012 15:04:37 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=54ec1e6b080c00d3b3f0b53fc15389a58abcb53a
The branch, maint has been updated
via 54ec1e6b080c00d3b3f0b53fc15389a58abcb53a (commit)
via b4896ce44ca5883bc34a2df0355ed3c8ad19485c (commit)
via 3e98c9d66b926a50ea7cabce7992bd30da2c6fb8 (commit)
via 1df23e4ad00a924fcff94b0894b1d9de2a497300 (commit)
via 691a1a829501c3503375ede305dced9fd12dddf8 (commit)
via a1e790331b4e5d7d96ff0208999b673feb363b95 (commit)
via 993fd9f3f6ede8ef9c1cbb1fa91fa60b9ccf57d7 (commit)
via 1f113f6bc81edabbbda7e14d58b10ac02d7a1137 (commit)
from 411ada9995cb7d66ea2ede4334172fb9be39ae94 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 54ec1e6b080c00d3b3f0b53fc15389a58abcb53a
Author: Stefano Lattarini <address@hidden>
Date: Mon Nov 26 15:26:44 2012 +0100
news: we'll remove AM_PROG_MKDIR in 1.14, not 1.13
See also commit v1.12.4-158-gdf23daf.
* NEWS (Future backward-incompatibilities): Adjust accordingly.
Signed-off-by: Stefano Lattarini <address@hidden>
commit b4896ce44ca5883bc34a2df0355ed3c8ad19485c
Author: Stefano Lattarini <address@hidden>
Date: Mon Nov 26 15:15:11 2012 +0100
tests: give few vala tests more significant names
* t/vala.sh: Rename ...
* t/vala-grepping.sh: ... like this.
* t/vala2.sh: Rename ...
* t/vala-recursive-setup.sh: ... like this.
* t/vala3.sh: Rename ...
* t/vala-non-recursive-setup.sh: ... like this.
* t/vala4.sh: Rename ...
* t/vala-configure.sh: ... like this.
* t/vala5.sh: Rename ...
* t/vala-per-target-flags.sh: ... like this, and slightly
improve heading comments.
* t/list-of-tests.mk: Adjust.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 3e98c9d66b926a50ea7cabce7992bd30da2c6fb8
Author: Stefano Lattarini <address@hidden>
Date: Mon Nov 26 14:48:29 2012 +0100
vala tests: don't use the 'posix' profile, it's no longer supported
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 <address@hidden>
* 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 <address@hidden>
commit 1df23e4ad00a924fcff94b0894b1d9de2a497300
Author: Stefano Lattarini <address@hidden>
Date: Mon Nov 26 13:33:45 2012 +0100
news: fixup: bug#8847 is fixed in 1.12.6, not in 1.12.5
* NEWS (Bugs fixed in 1.12.5): So move it from here ...
(Bugs fixed in 1.12.6): ... to here.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 691a1a829501c3503375ede305dced9fd12dddf8
Author: Stefano Lattarini <address@hidden>
Date: Mon Nov 26 13:01:46 2012 +0100
news: document the fix for automake bug#10227
This is a follow-up commit for v1.12.5-14-g1f113f6.
* NEWS: Update.
Signed-off-by: Stefano Lattarini <address@hidden>
commit a1e790331b4e5d7d96ff0208999b673feb363b95
Merge: 993fd9f 1f113f6
Author: Stefano Lattarini <address@hidden>
Date: Mon Nov 26 12:51:16 2012 +0100
Merge branch 'python-fix-pr10227' into maint
* python-fix-pr10227:
python: make installed modules find by default on Debian and Ubuntu
commit 993fd9f3f6ede8ef9c1cbb1fa91fa60b9ccf57d7
Author: Stefano Lattarini <address@hidden>
Date: Mon Nov 26 12:22:51 2012 +0100
tests: fix a spurious testsuite failure on Solaris
Reported in automake bug#11524.
* t/amhello-binpkg.sh: When non-GNU tar is in use, relax grepping of
"tar cvf ..." output a little more.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 1f113f6bc81edabbbda7e14d58b10ac02d7a1137
Author: Stefano Lattarini <address@hidden>
Date: Thu Nov 22 12:03:07 2012 +0100
python: make installed modules find by default on Debian and Ubuntu
This change fixes automake bug#10227.
The code used to get the python package directory was wrong for Python 3,
at least on Debian and Ubuntu distributions. In the case the installation
was using the default prefix "/usr/local", python modules were incorrectly
installed in the directory
/usr/local/lib/python3/dist-packages
(which is *not* searched by default), rather than in a directory like
/usr/local/lib/python3.x/dist-packages
which is searched by default.
* m4/python.m4 (AM_PATH_PYTHON): Try to use the 'sysconfig' module if
possible, for better interactions with python 3.x.
Helped-by: Reuben Thomas <address@hidden>
Helped-by: Roumen Petrov <address@hidden>
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
NEWS | 39 ++++++++++++++++++++++-----
m4/python.m4 | 37 ++++++++++++++++++++++++-
t/amhello-binpkg.sh | 4 +-
t/list-of-tests.mk | 14 +++++-----
t/{vala4.sh => vala-configure.sh} | 0
t/{vala.sh => vala-grepping.sh} | 0
t/vala-libs.sh | 2 +-
t/vala-mix.sh | 10 ++++---
t/vala-mix2.sh | 6 +++-
t/{vala3.sh => vala-non-recursive-setup.sh} | 0
t/vala-parallel.sh | 6 +++-
t/{vala5.sh => vala-per-target-flags.sh} | 2 +-
t/{vala2.sh => vala-recursive-setup.sh} | 0
t/vala-vapi.sh | 13 +++++---
t/vala-vpath.sh | 8 +++--
15 files changed, 105 insertions(+), 36 deletions(-)
rename t/{vala4.sh => vala-configure.sh} (100%)
rename t/{vala.sh => vala-grepping.sh} (100%)
rename t/{vala3.sh => vala-non-recursive-setup.sh} (100%)
rename t/{vala5.sh => vala-per-target-flags.sh} (97%)
rename t/{vala2.sh => vala-recursive-setup.sh} (100%)
diff --git a/NEWS b/NEWS
index c593896..7a230ef 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ New in 1.12.6:
option) will be removed in the next major Automake release (1.13).
- The long-obsolete (since automake 1.10) AM_PROG_MKDIR m4 macro will
- be removed in Automake 1.13. The $(mkdir_p) make variable and the
+ be removed in Automake 1.14. The $(mkdir_p) make variable and the
@mkdir_p@ substitution will still remain available (as aliases of
$(MKDIR_P)) for the moment, for better backward compatibility.
@@ -63,10 +63,38 @@ New in 1.12.6:
Bugs fixed in 1.12.6:
-* Bugs introduced in 1.12.5:
+* Python-related bugs:
- - The maintainer rebuild rules for Makefiles and aclocal.m4 in Automake's
- own build system works correctly again.
+ - The default installation location for python modules has been improved
+ for Python 3 on Debian and Ubuntu systems, changing from:
+
+ ${prefix}/lib/python3/dist-packages
+
+ to
+
+ ${prefix}/lib/python3.x/site-packages
+
+ This change should ensure modules installed using the default ${prefix}
+ "/usr/local" are found by default by system python 3.x installations.
+ See automake bug#10227.
+
+ - 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.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -114,9 +142,6 @@ Bugs fixed in 1.12.5:
finding classic 'libname.a' style libraries when 'name.lib' and
'name.dll.lib' aren't available.
- - Python byte-compilation supports the new layout mandated by PEP-3147,
- with its __pycache__ directory (automake bug#8847).
-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
New in 1.12.4:
diff --git a/m4/python.m4 b/m4/python.m4
index 50213a9..5d9d057 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -106,6 +106,25 @@ AC_DEFUN([AM_PATH_PYTHON],
[am_cv_python_platform=`$PYTHON -c "import sys;
sys.stdout.write(sys.platform)"`])
AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
+ # Just factor out some code duplication.
+ am_python_setup_sysconfig="\
+import sys
+# Prefer sysconfig over distutils.sysconfig, for better compatibility
+# with python 3.x. See automake bug#10227.
+try:
+ import sysconfig
+except ImportError:
+ can_use_sysconfig = 0
+else:
+ can_use_sysconfig = 1
+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
+# <https://github.com/pypa/virtualenv/issues/118>
+try:
+ from platform import python_implementation
+ if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7':
+ can_use_sysconfig = 0
+except ImportError:
+ pass"
dnl Set up 4 directories:
@@ -122,7 +141,14 @@ AC_DEFUN([AM_PATH_PYTHON],
else
am_py_prefix=$prefix
fi
- am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import
sysconfig;
sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))"
2>/dev/null`
+ am_cv_python_pythondir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+ sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+else:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
case $am_cv_python_pythondir in
$am_py_prefix*)
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
@@ -157,7 +183,14 @@ AC_DEFUN([AM_PATH_PYTHON],
else
am_py_exec_prefix=$exec_prefix
fi
- am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import
sysconfig;
sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))"
2>/dev/null`
+ am_cv_python_pyexecdir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+ sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+else:
+ from distutils import sysconfig
+ sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
case $am_cv_python_pyexecdir in
$am_py_exec_prefix*)
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
diff --git a/t/amhello-binpkg.sh b/t/amhello-binpkg.sh
index c1d2575..f6988ce 100755
--- a/t/amhello-binpkg.sh
+++ b/t/amhello-binpkg.sh
@@ -44,8 +44,8 @@ if tar --version </dev/null | grep GNU; then
END
else
: Be laxer with other tar implementations, to avoid spurious failures.
- $EGREP '(^| )\./usr/bin/hello'$EXEEXT'( |$)' tar.got
- $EGREP '(^| )\./usr/share/doc/amhello/README( |$)' tar.got
+ $EGREP '(^| )(\./)?usr/bin/hello'$EXEEXT'( |$)' tar.got
+ $EGREP '(^| )(\./)?usr/share/doc/amhello/README( |$)' tar.got
fi
:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 8d551d1..8b58c2f 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1199,18 +1199,18 @@ t/unused.sh \
t/upc.sh \
t/upc2.sh \
t/upc3.sh \
-t/vala.sh \
-t/vala2.sh \
-t/vala3.sh \
-t/vala4.sh \
-t/vala5.sh \
-t/vala-vapi.sh \
+t/vala-configure.sh \
+t/vala-grepping.sh \
t/vala-headers.sh \
t/vala-libs.sh \
-t/vala-vpath.sh \
t/vala-mix.sh \
t/vala-mix2.sh \
+t/vala-non-recursive-setup.sh \
t/vala-parallel.sh \
+t/vala-per-target-flags.sh \
+t/vala-recursive-setup.sh \
+t/vala-vapi.sh \
+t/vala-vpath.sh \
t/vars.sh \
t/vars3.sh \
t/vartar.sh \
diff --git a/t/vala4.sh b/t/vala-configure.sh
similarity index 100%
rename from t/vala4.sh
rename to t/vala-configure.sh
diff --git a/t/vala.sh b/t/vala-grepping.sh
similarity index 100%
rename from t/vala.sh
rename to t/vala-grepping.sh
diff --git a/t/vala-libs.sh b/t/vala-libs.sh
index c38740f..852051b 100755
--- a/t/vala-libs.sh
+++ b/t/vala-libs.sh
@@ -36,7 +36,7 @@ lib_LIBRARIES = libmu.a
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
diff --git a/t/vala-mix.sh b/t/vala-mix.sh
index 5e2e7ce..44b5a3b 100755
--- a/t/vala-mix.sh
+++ b/t/vala-mix.sh
@@ -16,23 +16,25 @@
# 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
diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
index 9b2402d..3e823e2 100755
--- a/t/vala-mix2.sh
+++ b/t/vala-mix2.sh
@@ -17,19 +17,21 @@
# 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
diff --git a/t/vala3.sh b/t/vala-non-recursive-setup.sh
similarity index 100%
rename from t/vala3.sh
rename to t/vala-non-recursive-setup.sh
diff --git a/t/vala-parallel.sh b/t/vala-parallel.sh
index c71420a..b68d762 100755
--- a/t/vala-parallel.sh
+++ b/t/vala-parallel.sh
@@ -16,19 +16,21 @@
# 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
diff --git a/t/vala5.sh b/t/vala-per-target-flags.sh
similarity index 97%
rename from t/vala5.sh
rename to t/vala-per-target-flags.sh
index 9cd57f8..5eae281 100755
--- a/t/vala5.sh
+++ b/t/vala-per-target-flags.sh
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Test per-target flags.
+# Test per-target flags in vala support.
required="pkg-config valac gcc GNUmake"
. test-init.sh
diff --git a/t/vala2.sh b/t/vala-recursive-setup.sh
similarity index 100%
rename from t/vala2.sh
rename to t/vala-recursive-setup.sh
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
index f006832..545a0ea 100755
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
@@ -16,27 +16,30 @@
# 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
diff --git a/t/vala-vpath.sh b/t/vala-vpath.sh
index 7428b97..7e2a984 100755
--- a/t/vala-vpath.sh
+++ b/t/vala-vpath.sh
@@ -17,21 +17,23 @@
# 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
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.5-21-g54ec1e6,
Stefano Lattarini <=