diff options
Diffstat (limited to 'meta/recipes-devtools/automake/automake')
3 files changed, 140 insertions, 0 deletions
diff --git a/meta/recipes-devtools/automake/automake/buildtest.patch b/meta/recipes-devtools/automake/automake/buildtest.patch new file mode 100644 index 0000000000..1dd5337849 --- /dev/null +++ b/meta/recipes-devtools/automake/automake/buildtest.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | Split "check-TESTS" into a buildtest and runtest target, so that they can | ||
2 | be run separately. | ||
3 | |||
4 | Signed-off-by: Björn Stenberg <bjst@enea.com> | ||
5 | Upstream-Status: Pending | ||
6 | |||
7 | --- a/lib/am/check.am 2012-11-14 13:46:16.335475995 +0100 | ||
8 | +++ b/lib/am/check.am 2012-08-13 18:40:12.000000000 +0200 | ||
9 | @@ -44,7 +44,7 @@ | ||
10 | am__tty_colors = $(am__tty_colors_dummy) | ||
11 | endif !%?COLOR% | ||
12 | |||
13 | -.PHONY: check-TESTS | ||
14 | +.PHONY: check-TESTS buildtest-TESTS runtest-TESTS | ||
15 | |||
16 | if %?PARALLEL_TESTS% | ||
17 | |||
18 | @@ -465,7 +465,14 @@ | ||
19 | |||
20 | else !%?PARALLEL_TESTS% | ||
21 | |||
22 | -check-TESTS: $(TESTS) | ||
23 | +AM_RECURSIVE_TARGETS += buildtest runtest | ||
24 | + | ||
25 | +buildtest-TESTS: $(TESTS) | ||
26 | + | ||
27 | +check-TESTS: buildtest-TESTS | ||
28 | + $(MAKE) $(AM_MAKEFLAGS) runtest-TESTS | ||
29 | + | ||
30 | +runtest-TESTS: | ||
31 | @failed=0; all=0; xfail=0; xpass=0; skip=0; \ | ||
32 | srcdir=$(srcdir); export srcdir; \ | ||
33 | ## Make sure Solaris VPATH-expands all members of this list, even | ||
diff --git a/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch b/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch new file mode 100644 index 0000000000..f8334a7212 --- /dev/null +++ b/meta/recipes-devtools/automake/automake/py-compile-compile-only-optimized-byte-code.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | * OE-Core's python creates the same binary output | ||
4 | for both pyc and pyo, so disable the creation of | ||
5 | pyc files by automake. | ||
6 | |||
7 | Signed-off-by: Andreas Oberritter <obi@opendreambox.org> | ||
8 | |||
9 | Updated for automake-1.12.6 | ||
10 | |||
11 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
12 | |||
13 | diff -Nurd automake-1.12.6/lib/py-compile automake-1.12.6/lib/py-compile | ||
14 | --- automake-1.12.6/lib/py-compile 2012-12-13 21:57:31.000000000 +0200 | ||
15 | +++ automake-1.12.6/lib/py-compile 2012-12-27 19:34:01.426015140 +0200 | ||
16 | @@ -115,26 +115,6 @@ | ||
17 | filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" | ||
18 | fi | ||
19 | |||
20 | -$PYTHON -c " | ||
21 | -import sys, os, py_compile, imp | ||
22 | - | ||
23 | -files = '''$files''' | ||
24 | - | ||
25 | -sys.stdout.write('Byte-compiling python modules...\n') | ||
26 | -for file in files.split(): | ||
27 | - $pathtrans | ||
28 | - $filetrans | ||
29 | - if not os.path.exists(filepath) or not (len(filepath) >= 3 | ||
30 | - and filepath[-3:] == '.py'): | ||
31 | - continue | ||
32 | - sys.stdout.write(file) | ||
33 | - sys.stdout.flush() | ||
34 | - if hasattr(imp, 'get_tag'): | ||
35 | - py_compile.compile(filepath, imp.cache_from_source(filepath), path) | ||
36 | - else: | ||
37 | - py_compile.compile(filepath, filepath + 'c', path) | ||
38 | -sys.stdout.write('\n')" || exit $? | ||
39 | - | ||
40 | # this will fail for python < 1.5, but that doesn't matter ... | ||
41 | $PYTHON -O -c " | ||
42 | import sys, os, py_compile, imp | ||
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch new file mode 100644 index 0000000000..47541bdedc --- /dev/null +++ b/meta/recipes-devtools/automake/automake/python-libdir.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> | ||
4 | |||
5 | Updated for automake-1.12.6 | ||
6 | |||
7 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
8 | |||
9 | diff -Nurd automake-1.12.6/m4/python.m4 automake-1.12.6/m4/python.m4 | ||
10 | --- automake-1.12.6/m4/python.m4 2012-12-13 22:02:25.000000000 +0200 | ||
11 | +++ automake-1.12.6/m4/python.m4 2012-12-27 17:40:26.558164660 +0200 | ||
12 | @@ -91,12 +91,13 @@ | ||
13 | [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) | ||
14 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | ||
15 | |||
16 | - dnl Use the values of $prefix and $exec_prefix for the corresponding | ||
17 | - dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made | ||
18 | + dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding | ||
19 | + dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX. These are made | ||
20 | dnl distinct variables so they can be overridden if need be. However, | ||
21 | dnl general consensus is that you shouldn't need this ability. | ||
22 | |||
23 | AC_SUBST([PYTHON_PREFIX], ['${prefix}']) | ||
24 | + AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}']) | ||
25 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) | ||
26 | |||
27 | dnl At times (like when building shared libraries) you may want | ||
28 | @@ -148,7 +149,8 @@ | ||
29 | else: | ||
30 | from distutils import sysconfig | ||
31 | sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') | ||
32 | -sys.stdout.write(sitedir)"` | ||
33 | +sys.stdout.write(sitedir)" || | ||
34 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
35 | case $am_cv_python_pythondir in | ||
36 | $am_py_prefix*) | ||
37 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` | ||
38 | @@ -158,7 +160,7 @@ | ||
39 | case $am_py_prefix in | ||
40 | /usr|/System*) ;; | ||
41 | *) | ||
42 | - am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages | ||
43 | + am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
44 | ;; | ||
45 | esac | ||
46 | ;; | ||
47 | @@ -190,7 +192,8 @@ | ||
48 | else: | ||
49 | from distutils import sysconfig | ||
50 | sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') | ||
51 | -sys.stdout.write(sitedir)"` | ||
52 | +sys.stdout.write(sitedir)" || | ||
53 | + echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
54 | case $am_cv_python_pyexecdir in | ||
55 | $am_py_exec_prefix*) | ||
56 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` | ||
57 | @@ -200,7 +203,7 @@ | ||
58 | case $am_py_exec_prefix in | ||
59 | /usr|/System*) ;; | ||
60 | *) | ||
61 | - am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages | ||
62 | + am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
63 | ;; | ||
64 | esac | ||
65 | ;; | ||