diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/automake')
6 files changed, 263 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake.inc b/import-layers/yocto-poky/meta/recipes-devtools/automake/automake.inc new file mode 100644 index 000000000..4f9b5f774 --- /dev/null +++ b/import-layers/yocto-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', True))}" + +FILES_${PN} += "${datadir}/automake* ${datadir}/aclocal*" diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/buildtest.patch b/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/buildtest.patch new file mode 100644 index 000000000..1dd533784 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/buildtest.patch @@ -0,0 +1,33 @@ +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 + +--- a/lib/am/check.am 2012-11-14 13:46:16.335475995 +0100 ++++ b/lib/am/check.am 2012-08-13 18:40:12.000000000 +0200 +@@ -44,7 +44,7 @@ + am__tty_colors = $(am__tty_colors_dummy) + endif !%?COLOR% + +-.PHONY: check-TESTS ++.PHONY: check-TESTS buildtest-TESTS runtest-TESTS + + if %?PARALLEL_TESTS% + +@@ -465,7 +465,14 @@ + + else !%?PARALLEL_TESTS% + +-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/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch new file mode 100644 index 000000000..2c6594f52 --- /dev/null +++ b/import-layers/yocto-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/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/performance.patch b/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/performance.patch new file mode 100644 index 000000000..3e6d5694d --- /dev/null +++ b/import-layers/yocto-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/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/python-libdir.patch b/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/python-libdir.patch new file mode 100644 index 000000000..47541bded --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/automake/automake/python-libdir.patch @@ -0,0 +1,65 @@ +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> + +diff -Nurd automake-1.12.6/m4/python.m4 automake-1.12.6/m4/python.m4 +--- automake-1.12.6/m4/python.m4 2012-12-13 22:02:25.000000000 +0200 ++++ automake-1.12.6/m4/python.m4 2012-12-27 17:40:26.558164660 +0200 +@@ -91,12 +91,13 @@ + [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 +@@ -148,7 +149,8 @@ + else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` ++sys.stdout.write(sitedir)" || ++ 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 +160,7 @@ + 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 + ;; +@@ -190,7 +192,8 @@ + else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +-sys.stdout.write(sitedir)"` ++sys.stdout.write(sitedir)" || ++ 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 +203,7 @@ + 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 + ;; diff --git a/import-layers/yocto-poky/meta/recipes-devtools/automake/automake_1.15.bb b/import-layers/yocto-poky/meta/recipes-devtools/automake/automake_1.15.bb new file mode 100644 index 000000000..a3c72fd33 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-devtools/automake/automake_1.15.bb @@ -0,0 +1,35 @@ +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" + +SRC_URI += " file://python-libdir.patch \ + file://buildtest.patch \ + file://performance.patch \ + file://new_rt_path_for_test-driver.patch" + +SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3" +SRC_URI[sha256sum] = "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924" + +CACHED_CONFIGUREVARS += "ac_cv_path_PERL=${USRBINPATH}/perl" + +do_install_append () { + install -d ${D}${datadir} +} + +BBCLASSEXTEND = "native nativesdk" |