diff options
Diffstat (limited to 'poky/meta/recipes-devtools/automake')
8 files changed, 422 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/automake/automake.inc b/poky/meta/recipes-devtools/automake/automake.inc new file mode 100644 index 000000000..87cedc983 --- /dev/null +++ b/poky/meta/recipes-devtools/automake/automake.inc @@ -0,0 +1,21 @@ +SUMMARY = "A GNU tool for automatically generating Makefiles" +DESCRIPTION = "Automake is a tool for automatically generating `Makefile.in' files compliant with the GNU Coding \ +Standards. Automake requires the use of Autoconf." +LICENSE = "GPLv2" +HOMEPAGE = "http://www.gnu.org/software/automake/" +SECTION = "devel" + +SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.gz" + +inherit autotools texinfo + +do_configure() { + # We can end up patching macros, which would then mean autoreconf + # Cheat by saying everything is up to date. + touch ${S}/aclocal.m4 ${S}/Makefile.in ${S}/configure + oe_runconf +} + +export AUTOMAKE = "${@bb.utils.which('automake', d.getVar('PATH'))}" + +FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" diff --git a/poky/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch b/poky/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch new file mode 100644 index 000000000..1221f1306 --- /dev/null +++ b/poky/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch @@ -0,0 +1,27 @@ +From 25a8ac30486798d23f516722d73eb622e6264f28 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 26 Jul 2017 11:19:56 -0700 +Subject: [PATCH] automake: Add default libtool_tag to cppasm. + + * bin/automake.in (register_language): Define default libtool tag to be CC + since CPPASCOMPILE is using CC to call assembler + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + bin/automake.in | 1 + + 1 file changed, 1 insertion(+) + +Index: automake-1.15.1/bin/automake.in +=================================================================== +--- automake-1.15.1.orig/bin/automake.in ++++ automake-1.15.1/bin/automake.in +@@ -831,6 +831,7 @@ register_language ('name' => 'cppasm', + 'compiler' => 'CPPASCOMPILE', + 'compile_flag' => '-c', + 'output_flag' => '-o', ++ 'libtool_tag' => 'CC', + 'extensions' => ['.S', '.sx']); + + # Fortran 77 diff --git a/poky/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch b/poky/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch new file mode 100644 index 000000000..96b5a3d6b --- /dev/null +++ b/poky/meta/recipes-devtools/automake/automake/automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch @@ -0,0 +1,96 @@ +From 41e06b7a354774913dcd2e32a35440e407843357 Mon Sep 17 00:00:00 2001 +From: Serhii Popovych <spopovyc@cisco.com> +Date: Wed, 10 Feb 2016 17:07:32 +0000 +Subject: [PATCH] perl: Replace -w option in shebangs with modern "use + warnings" In some builds we might provide ac_cv_path_PERL as /usr/bin/env + perl to use newer version of the perl from users PATH rather than older from + standard system path. + +However using /usr/bin/env perl -w from shebang line isn't +possible because it translates to something like +/usr/bin/env -w perl and env complains about illegal option. + +To address this we can remove -w option from perl shebang +line and add "use warnings" statement. + +Upstream-Status: Pending +Signed-off-by: Serhii Popovych <spopovyc@cisco.com> +--- + bin/aclocal.in | 3 ++- + bin/automake.in | 3 ++- + t/wrap/aclocal.in | 3 ++- + t/wrap/automake.in | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +Index: automake-1.15.1/bin/aclocal.in +=================================================================== +--- automake-1.15.1.orig/bin/aclocal.in ++++ automake-1.15.1/bin/aclocal.in +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # -*- perl -*- + # @configure_input@ + +@@ -33,6 +33,7 @@ BEGIN + } + + use strict; ++use warnings; + + use Automake::Config; + use Automake::General; +Index: automake-1.15.1/bin/automake.in +=================================================================== +--- automake-1.15.1.orig/bin/automake.in ++++ automake-1.15.1/bin/automake.in +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # -*- perl -*- + # @configure_input@ + +@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; + package Automake; + + use strict; ++use warnings; + + BEGIN + { +Index: automake-1.15.1/t/wrap/aclocal.in +=================================================================== +--- automake-1.15.1.orig/t/wrap/aclocal.in ++++ automake-1.15.1/t/wrap/aclocal.in +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # @configure_input@ + + # Copyright (C) 2012-2017 Free Software Foundation, Inc. +@@ -19,6 +19,7 @@ + BEGIN + { + use strict; ++ use warnings; + @Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib'); + unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib' + if '@srcdir@' ne '.'; +Index: automake-1.15.1/t/wrap/automake.in +=================================================================== +--- automake-1.15.1.orig/t/wrap/automake.in ++++ automake-1.15.1/t/wrap/automake.in +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # @configure_input@ + + # Copyright (C) 2012-2017 Free Software Foundation, Inc. +@@ -19,6 +19,7 @@ + BEGIN + { + use strict; ++ use warnings; + @Automake::perl_libdirs = ('@abs_top_srcdir@/lib'); + unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib' + if '@srcdir@' ne '.'; diff --git a/poky/meta/recipes-devtools/automake/automake/buildtest.patch b/poky/meta/recipes-devtools/automake/automake/buildtest.patch new file mode 100644 index 000000000..c32cd1fb1 --- /dev/null +++ b/poky/meta/recipes-devtools/automake/automake/buildtest.patch @@ -0,0 +1,35 @@ +Split "check-TESTS" into a buildtest and runtest target, so that they can +be run separately. + +Signed-off-by: Björn Stenberg <bjst@enea.com> +Upstream-Status: Pending + +Index: automake-1.15.1/lib/am/check.am +=================================================================== +--- automake-1.15.1.orig/lib/am/check.am ++++ automake-1.15.1/lib/am/check.am +@@ -41,7 +41,7 @@ am__tty_colors = { \ + fi; \ + } + +-.PHONY: check-TESTS ++.PHONY: check-TESTS buildtest-TESTS runtest-TESTS + + if !%?SERIAL_TESTS% + +@@ -466,7 +466,14 @@ else %?SERIAL_TESTS% + + ## Obsolescent serial testsuite driver. + +-check-TESTS: $(TESTS) ++AM_RECURSIVE_TARGETS += buildtest runtest ++ ++buildtest-TESTS: $(TESTS) ++ ++check-TESTS: buildtest-TESTS ++ $(MAKE) $(AM_MAKEFLAGS) runtest-TESTS ++ ++runtest-TESTS: + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + ## Make sure Solaris VPATH-expands all members of this list, even diff --git a/poky/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/poky/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch new file mode 100644 index 000000000..2c6594f52 --- /dev/null +++ b/poky/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch @@ -0,0 +1,36 @@ +Set relative to top_builddir path in Makefile to access test-driver + +Signed-off-by: Adrian Calianu <adrian.calianu@enea.com> +Upstream-Status: Pending +Bug-Report: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=19042 + +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -272,6 +272,9 @@ + # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used + # in Makefiles. + my $am_config_aux_dir = ''; ++# Directory used at runtime like running test-driver that should not ++# depend on $(top_srcdir) ++my $am_config_rt_aux_dir = ''; + + # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR + # in configure.ac. +@@ -4700,7 +4703,7 @@ + { + require_conf_file ("parallel-tests", FOREIGN, 'test-driver'); + define_variable ("${pfx}LOG_DRIVER", +- "\$(SHELL) $am_config_aux_dir/test-driver", ++ "\$(SHELL) $am_config_rt_aux_dir/test-driver", + INTERNAL); + } + my $driver = '$(' . $pfx . 'LOG_DRIVER)'; +@@ -7284,6 +7287,10 @@ + $am_config_aux_dir = + '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); + $am_config_aux_dir =~ s,/*$,,; ++ ++ $am_config_rt_aux_dir = ++ '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); ++ $am_config_rt_aux_dir =~ s,/*$,,; + } diff --git a/poky/meta/recipes-devtools/automake/automake/performance.patch b/poky/meta/recipes-devtools/automake/automake/performance.patch new file mode 100644 index 000000000..3e6d5694d --- /dev/null +++ b/poky/meta/recipes-devtools/automake/automake/performance.patch @@ -0,0 +1,73 @@ +By default automake puts "sleep 1" into the start of configure scripts +which adds pointless delays to them. Rather than do this, lets just assume +our systems are sane. + +RP +2015/12/7 +Upstream-Status: Inappropriate + +Index: automake-1.15/m4/sanity.m4 +=================================================================== +--- automake-1.15.orig/m4/sanity.m4 ++++ automake-1.15/m4/sanity.m4 +@@ -23,60 +23,5 @@ case $srcdir in + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; + esac + +-# Do 'set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- am_has_slept=no +- for am_try in 1 2; do +- echo "timestamp, slept: $am_has_slept" > conftest.file +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` +- fi +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then +- +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +- alias in your environment]) +- fi +- if test "$[2]" = conftest.file || test $am_try -eq 2; then +- break +- fi +- # Just in case. +- sleep 1 +- am_has_slept=yes +- done +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi + AC_MSG_RESULT([yes]) +-# If we didn't sleep, we still need to ensure time stamps of config.status and +-# generated files are strictly newer. +-am_sleep_pid= +-if grep 'slept: no' conftest.file >/dev/null 2>&1; then +- ( sleep 1 ) & +- am_sleep_pid=$! +-fi +-AC_CONFIG_COMMANDS_PRE( +- [AC_MSG_CHECKING([that generated files are newer than configure]) +- if test -n "$am_sleep_pid"; then +- # Hide warnings about reused PIDs. +- wait $am_sleep_pid 2>/dev/null +- fi +- AC_MSG_RESULT([done])]) +-rm -f conftest.file + ]) diff --git a/poky/meta/recipes-devtools/automake/automake/python-libdir.patch b/poky/meta/recipes-devtools/automake/automake/python-libdir.patch new file mode 100644 index 000000000..2a48b133e --- /dev/null +++ b/poky/meta/recipes-devtools/automake/automake/python-libdir.patch @@ -0,0 +1,91 @@ +From 472a3d36c97ef7535f05d6c185edcbc22b0074c4 Mon Sep 17 00:00:00 2001 +From: Kumar Gala <galak@kernel.crashing.org> +Date: Thu, 11 Aug 2011 01:26:33 -0500 +Subject: [PATCH 1/4] automake: Update for python.m4 to respect libdir + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Kumar Gala <galak@kernel.crashing.org> + +Updated for automake-1.12.6 + +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +--- + m4/python.m4 | 27 +++++++-------------------- + 1 file changed, 7 insertions(+), 20 deletions(-) + +diff --git a/m4/python.m4 b/m4/python.m4 +index 5b2c695..ed19261 100644 +--- a/m4/python.m4 ++++ b/m4/python.m4 +@@ -91,12 +91,13 @@ AC_DEFUN([AM_PATH_PYTHON], + [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) + AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) + +- dnl Use the values of $prefix and $exec_prefix for the corresponding +- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made ++ dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding ++ dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX. These are made + dnl distinct variables so they can be overridden if need be. However, + dnl general consensus is that you shouldn't need this ability. + + AC_SUBST([PYTHON_PREFIX], ['${prefix}']) ++ AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}']) + AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) + + dnl At times (like when building shared libraries) you may want +@@ -141,14 +142,7 @@ except ImportError: + else + am_py_prefix=$prefix + fi +- 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)"` ++ am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` +@@ -158,7 +152,7 @@ sys.stdout.write(sitedir)"` + case $am_py_prefix in + /usr|/System*) ;; + *) +- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages ++ am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages + ;; + esac + ;; +@@ -183,14 +177,7 @@ sys.stdout.write(sitedir)"` + else + am_py_exec_prefix=$exec_prefix + fi +- 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)"` ++ am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` +@@ -200,7 +187,7 @@ sys.stdout.write(sitedir)"` + case $am_py_exec_prefix in + /usr|/System*) ;; + *) +- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages ++ am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages + ;; + esac + ;; +-- +2.8.1 + diff --git a/poky/meta/recipes-devtools/automake/automake_1.15.1.bb b/poky/meta/recipes-devtools/automake/automake_1.15.1.bb new file mode 100644 index 000000000..4f9b616b6 --- /dev/null +++ b/poky/meta/recipes-devtools/automake/automake_1.15.1.bb @@ -0,0 +1,43 @@ +require automake.inc +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS_class-native = "autoconf-native" + +NAMEVER = "${@oe.utils.trim_version("${PV}", 2)}" + +RDEPENDS_${PN} += "\ + autoconf \ + perl \ + perl-module-bytes \ + perl-module-data-dumper \ + perl-module-strict \ + perl-module-text-parsewords \ + perl-module-thread-queue \ + perl-module-threads \ + perl-module-vars " + +RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native" +RDEPENDS_${PN}_class-nativesdk = "nativesdk-autoconf" + +SRC_URI += "file://python-libdir.patch \ + file://buildtest.patch \ + file://performance.patch \ + file://new_rt_path_for_test-driver.patch \ + file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ + file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \ + " + +SRC_URI[md5sum] = "95df3f2d6eb8f81e70b8cb63a93c8853" +SRC_URI[sha256sum] = "988e32527abe052307d21c8ca000aa238b914df363a617e38f4fb89f5abf6260" + +PERL = "${USRBINPATH}/perl" +PERL_class-native = "${USRBINPATH}/env perl" +PERL_class-nativesdk = "${USRBINPATH}/env perl" + +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" + +do_install_append () { + install -d ${D}${datadir} +} + +BBCLASSEXTEND = "native nativesdk" |