diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-17 16:34:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-21 11:05:01 +0000 |
commit | b5c30fb196d95cdf2d452f5f0a7ee979f2f8f455 (patch) | |
tree | d4385f147585d352363f892a5090d37e04bcd3be /meta/recipes-devtools | |
parent | 6e6146054912d1cd1bfcebf6d48f8c1db95d603b (diff) | |
download | poky-b5c30fb196d95cdf2d452f5f0a7ee979f2f8f455.tar.gz |
automake: update 1.16.3 -> 1.16.5
(From OE-Core rev: 851167b3a41b1728407d331c1666827fb730daa1)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch | 83 | ||||
-rw-r--r-- | meta/recipes-devtools/automake/automake/python-libdir.patch | 88 | ||||
-rw-r--r-- | meta/recipes-devtools/automake/automake_1.16.5.bb (renamed from meta/recipes-devtools/automake/automake_1.16.3.bb) | 5 |
3 files changed, 86 insertions, 90 deletions
diff --git a/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch b/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch new file mode 100644 index 0000000000..d28045618e --- /dev/null +++ b/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch | |||
@@ -0,0 +1,83 @@ | |||
1 | From dff74c5b19935cc11b30116a7ae9c8affdff246b Mon Sep 17 00:00:00 2001 | ||
2 | From: Kumar Gala <galak@kernel.crashing.org> | ||
3 | Date: Thu, 11 Aug 2011 01:26:33 -0500 | ||
4 | Subject: [PATCH] automake: Update for python.m4 to respect libdir | ||
5 | |||
6 | Upstream-Status: Inappropriate [embedded specific] | ||
7 | |||
8 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> | ||
9 | |||
10 | Updated for automake-1.12.6 | ||
11 | |||
12 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | --- | ||
15 | m4/python.m4 | 24 ++++++------------------ | ||
16 | 1 file changed, 6 insertions(+), 18 deletions(-) | ||
17 | |||
18 | diff --git a/m4/python.m4 b/m4/python.m4 | ||
19 | index 4e7de9427..40fc5b396 100644 | ||
20 | --- a/m4/python.m4 | ||
21 | +++ b/m4/python.m4 | ||
22 | @@ -96,6 +96,8 @@ AC_DEFUN([AM_PATH_PYTHON], | ||
23 | [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`]) | ||
24 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | ||
25 | |||
26 | + AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}']) | ||
27 | + | ||
28 | dnl At times, e.g., when building shared libraries, you may want | ||
29 | dnl to know which OS platform Python thinks this is. | ||
30 | dnl | ||
31 | @@ -251,14 +253,7 @@ except ImportError: | ||
32 | else | ||
33 | am_py_prefix=$am_cv_python_prefix | ||
34 | fi | ||
35 | - am_cv_python_pythondir=`$PYTHON -c " | ||
36 | -$am_python_setup_sysconfig | ||
37 | -if can_use_sysconfig: | ||
38 | - sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) | ||
39 | -else: | ||
40 | - from distutils import sysconfig | ||
41 | - sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') | ||
42 | -sys.stdout.write(sitedir)"` | ||
43 | + am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
44 | # | ||
45 | case $am_cv_python_pythondir in | ||
46 | $am_py_prefix*) | ||
47 | @@ -268,7 +263,7 @@ sys.stdout.write(sitedir)"` | ||
48 | *) | ||
49 | case $am_py_prefix in | ||
50 | /usr|/System*) ;; | ||
51 | - *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages" | ||
52 | + *) am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
53 | ;; | ||
54 | esac | ||
55 | ;; | ||
56 | @@ -293,14 +288,7 @@ sys.stdout.write(sitedir)"` | ||
57 | else | ||
58 | am_py_exec_prefix=$am_cv_python_exec_prefix | ||
59 | fi | ||
60 | - am_cv_python_pyexecdir=`$PYTHON -c " | ||
61 | -$am_python_setup_sysconfig | ||
62 | -if can_use_sysconfig: | ||
63 | - sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) | ||
64 | -else: | ||
65 | - from distutils import sysconfig | ||
66 | - sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix') | ||
67 | -sys.stdout.write(sitedir)"` | ||
68 | + am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
69 | # | ||
70 | case $am_cv_python_pyexecdir in | ||
71 | $am_py_exec_prefix*) | ||
72 | @@ -310,7 +298,7 @@ sys.stdout.write(sitedir)"` | ||
73 | *) | ||
74 | case $am_py_exec_prefix in | ||
75 | /usr|/System*) ;; | ||
76 | - *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages" | ||
77 | + *) am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
78 | ;; | ||
79 | esac | ||
80 | ;; | ||
81 | -- | ||
82 | 2.20.1 | ||
83 | |||
diff --git a/meta/recipes-devtools/automake/automake/python-libdir.patch b/meta/recipes-devtools/automake/automake/python-libdir.patch deleted file mode 100644 index f319fc001b..0000000000 --- a/meta/recipes-devtools/automake/automake/python-libdir.patch +++ /dev/null | |||
@@ -1,88 +0,0 @@ | |||
1 | From 61bd143910001aaf610416d7ca56c52c0b081318 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kumar Gala <galak@kernel.crashing.org> | ||
3 | Date: Thu, 11 Aug 2011 01:26:33 -0500 | ||
4 | Subject: [PATCH] automake: Update for python.m4 to respect libdir | ||
5 | |||
6 | Upstream-Status: Inappropriate [embedded specific] | ||
7 | |||
8 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> | ||
9 | |||
10 | Updated for automake-1.12.6 | ||
11 | |||
12 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | |||
15 | --- | ||
16 | m4/python.m4 | 27 +++++++-------------------- | ||
17 | 1 file changed, 7 insertions(+), 20 deletions(-) | ||
18 | |||
19 | diff --git a/m4/python.m4 b/m4/python.m4 | ||
20 | index b2302ba..dbc6954 100644 | ||
21 | --- a/m4/python.m4 | ||
22 | +++ b/m4/python.m4 | ||
23 | @@ -96,12 +96,13 @@ AC_DEFUN([AM_PATH_PYTHON], | ||
24 | [am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`]) | ||
25 | AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) | ||
26 | |||
27 | - dnl Use the values of $prefix and $exec_prefix for the corresponding | ||
28 | - dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made | ||
29 | + dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding | ||
30 | + dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX. These are made | ||
31 | dnl distinct variables so they can be overridden if need be. However, | ||
32 | dnl general consensus is that you shouldn't need this ability. | ||
33 | |||
34 | AC_SUBST([PYTHON_PREFIX], ['${prefix}']) | ||
35 | + AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}']) | ||
36 | AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) | ||
37 | |||
38 | dnl At times (like when building shared libraries) you may want | ||
39 | @@ -146,14 +147,7 @@ except ImportError: | ||
40 | else | ||
41 | am_py_prefix=$prefix | ||
42 | fi | ||
43 | - am_cv_python_pythondir=`$PYTHON -c " | ||
44 | -$am_python_setup_sysconfig | ||
45 | -if can_use_sysconfig: | ||
46 | - sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) | ||
47 | -else: | ||
48 | - from distutils import sysconfig | ||
49 | - sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') | ||
50 | -sys.stdout.write(sitedir)"` | ||
51 | + am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
52 | case $am_cv_python_pythondir in | ||
53 | $am_py_prefix*) | ||
54 | am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` | ||
55 | @@ -163,7 +157,7 @@ sys.stdout.write(sitedir)"` | ||
56 | case $am_py_prefix in | ||
57 | /usr|/System*) ;; | ||
58 | *) | ||
59 | - am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages | ||
60 | + am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
61 | ;; | ||
62 | esac | ||
63 | ;; | ||
64 | @@ -188,14 +182,7 @@ sys.stdout.write(sitedir)"` | ||
65 | else | ||
66 | am_py_exec_prefix=$exec_prefix | ||
67 | fi | ||
68 | - am_cv_python_pyexecdir=`$PYTHON -c " | ||
69 | -$am_python_setup_sysconfig | ||
70 | -if can_use_sysconfig: | ||
71 | - sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) | ||
72 | -else: | ||
73 | - from distutils import sysconfig | ||
74 | - sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') | ||
75 | -sys.stdout.write(sitedir)"` | ||
76 | + am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"` | ||
77 | case $am_cv_python_pyexecdir in | ||
78 | $am_py_exec_prefix*) | ||
79 | am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` | ||
80 | @@ -205,7 +192,7 @@ sys.stdout.write(sitedir)"` | ||
81 | case $am_py_exec_prefix in | ||
82 | /usr|/System*) ;; | ||
83 | *) | ||
84 | - am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages | ||
85 | + am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages | ||
86 | ;; | ||
87 | esac | ||
88 | ;; | ||
diff --git a/meta/recipes-devtools/automake/automake_1.16.3.bb b/meta/recipes-devtools/automake/automake_1.16.5.bb index 1882eedcda..6a9c185e4d 100644 --- a/meta/recipes-devtools/automake/automake_1.16.3.bb +++ b/meta/recipes-devtools/automake/automake_1.16.5.bb | |||
@@ -18,7 +18,8 @@ RDEPENDS:${PN} += "\ | |||
18 | 18 | ||
19 | RDEPENDS:${PN}:class-native = "autoconf-native hostperl-runtime-native" | 19 | RDEPENDS:${PN}:class-native = "autoconf-native hostperl-runtime-native" |
20 | 20 | ||
21 | SRC_URI += "file://python-libdir.patch \ | 21 | SRC_URI += "\ |
22 | file://0001-automake-Update-for-python.m4-to-respect-libdir.patch \ | ||
22 | file://buildtest.patch \ | 23 | file://buildtest.patch \ |
23 | file://performance.patch \ | 24 | file://performance.patch \ |
24 | file://new_rt_path_for_test-driver.patch \ | 25 | file://new_rt_path_for_test-driver.patch \ |
@@ -26,7 +27,7 @@ SRC_URI += "file://python-libdir.patch \ | |||
26 | file://0001-build-fix-race-in-parallel-builds.patch \ | 27 | file://0001-build-fix-race-in-parallel-builds.patch \ |
27 | " | 28 | " |
28 | 29 | ||
29 | SRC_URI[sha256sum] = "ce010788b51f64511a1e9bb2a1ec626037c6d0e7ede32c1c103611b9d3cba65f" | 30 | SRC_URI[sha256sum] = "07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605" |
30 | 31 | ||
31 | PERL = "${USRBINPATH}/perl" | 32 | PERL = "${USRBINPATH}/perl" |
32 | PERL:class-native = "${USRBINPATH}/env perl" | 33 | PERL:class-native = "${USRBINPATH}/env perl" |