summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-27 20:47:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-07-30 07:54:44 +0100
commitf35b5f5d20f99dca06f579bccaceb5d7c2f9cf3f (patch)
treec5ebd71d03a6d2a26ea16ce9eb2f7a4b6858149e
parent231b7099e5979ac31b8c178de4e68f7a7269b404 (diff)
downloadpoky-f35b5f5d20f99dca06f579bccaceb5d7c2f9cf3f.tar.gz
autoconf: Upgrade to 2.72c
2.72c is a prerelease version of autoconf 2.73. It contains largefile and y2038 64 bit time_t improvements for 32 bit architectures. Rather than work on the older codebase, this brings us to work with the recent autoconf upstream with the 64 bit changes. It is unclear when upstream will release 2.73 but it is easier for us to be aligned now we've done the bulk of the work needed to update. Upstream added several patches which fixed several common failures OE builds ran into (backported in the next commit). In general testing has otherwise been good for us. There is an unfortunate gnulib largefile.m4 bug. This change patches various software to workaround it, next time they update new versions of the gnulib code will be pulled in which address the issue with the official fix. There are also a couple of ordering related fixes for apr and libarchive. (From OE-Core rev: bb74a03e927b4867d885ad3539b097f0e7ed108c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch50
-rw-r--r--meta/recipes-core/gettext/gettext_0.21.1.bb1
-rw-r--r--meta/recipes-devtools/autoconf/autoconf/0001-Port-to-compilers-that-moan-about-K-R-func-decls.patch138
-rw-r--r--meta/recipes-devtools/autoconf/autoconf_2.72c.bb (renamed from meta/recipes-devtools/autoconf/autoconf_2.71.bb)6
-rw-r--r--meta/recipes-devtools/bison/bison/autoconf-2.73.patch24
-rw-r--r--meta/recipes-devtools/bison/bison_3.8.2.bb1
-rw-r--r--meta/recipes-extended/findutils/findutils.inc1
-rw-r--r--meta/recipes-extended/findutils/findutils/autoconf-2.73.patch24
-rw-r--r--meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch24
-rw-r--r--meta/recipes-extended/gzip/gzip_1.12.bb1
-rw-r--r--meta/recipes-extended/libarchive/libarchive/configurehack.patch49
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.6.2.bb1
-rw-r--r--meta/recipes-extended/libpipeline/libpipeline/autoconf-2.73.patch24
-rw-r--r--meta/recipes-extended/libpipeline/libpipeline_1.5.7.bb1
-rw-r--r--meta/recipes-extended/man-db/files/autoconf-2.73.patch24
-rw-r--r--meta/recipes-extended/man-db/man-db_2.11.2.bb1
-rw-r--r--meta/recipes-extended/parted/files/autoconf-2.73.patch22
-rw-r--r--meta/recipes-extended/parted/parted_3.6.bb1
-rw-r--r--meta/recipes-support/apr/apr/autoconf-2.73.patch26
-rw-r--r--meta/recipes-support/apr/apr_1.7.4.bb1
20 files changed, 279 insertions, 141 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch b/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch
new file mode 100644
index 0000000000..ae5b2491bb
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.21.1/autoconf-2.73.patch
@@ -0,0 +1,50 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next gettext upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4
13===================================================================
14--- gettext-0.21.1.orig/gettext-runtime/gnulib-m4/largefile.m4
15+++ gettext-0.21.1/gettext-runtime/gnulib-m4/largefile.m4
16@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
17 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
18 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
19 # or configures them incorrectly in some cases.
20-m4_version_prereq([2.70], [], [
21+m4_version_prereq([2.73], [], [
22
23 # _AC_SYS_LARGEFILE_TEST_INCLUDES
24 # -------------------------------
25Index: gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4
26===================================================================
27--- gettext-0.21.1.orig/gettext-tools/gnulib-m4/largefile.m4
28+++ gettext-0.21.1/gettext-tools/gnulib-m4/largefile.m4
29@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
30 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
31 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
32 # or configures them incorrectly in some cases.
33-m4_version_prereq([2.70], [], [
34+m4_version_prereq([2.73], [], [
35
36 # _AC_SYS_LARGEFILE_TEST_INCLUDES
37 # -------------------------------
38Index: gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4
39===================================================================
40--- gettext-0.21.1.orig/libtextstyle/gnulib-m4/largefile.m4
41+++ gettext-0.21.1/libtextstyle/gnulib-m4/largefile.m4
42@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
43 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
44 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
45 # or configures them incorrectly in some cases.
46-m4_version_prereq([2.70], [], [
47+m4_version_prereq([2.73], [], [
48
49 # _AC_SYS_LARGEFILE_TEST_INCLUDES
50 # -------------------------------
diff --git a/meta/recipes-core/gettext/gettext_0.21.1.bb b/meta/recipes-core/gettext/gettext_0.21.1.bb
index b80ea9276e..2f030a2df9 100644
--- a/meta/recipes-core/gettext/gettext_0.21.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.21.1.bb
@@ -29,6 +29,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
29 file://serial-tests-config.patch \ 29 file://serial-tests-config.patch \
30 file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ 30 file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \
31 file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ 31 file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \
32 file://autoconf-2.73.patch \
32 " 33 "
33SRC_URI[sha256sum] = "e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45" 34SRC_URI[sha256sum] = "e8c3650e1d8cee875c4f355642382c1df83058bd5a11ee8555c0cf276d646d45"
34 35
diff --git a/meta/recipes-devtools/autoconf/autoconf/0001-Port-to-compilers-that-moan-about-K-R-func-decls.patch b/meta/recipes-devtools/autoconf/autoconf/0001-Port-to-compilers-that-moan-about-K-R-func-decls.patch
deleted file mode 100644
index 4f15bf96c3..0000000000
--- a/meta/recipes-devtools/autoconf/autoconf/0001-Port-to-compilers-that-moan-about-K-R-func-decls.patch
+++ /dev/null
@@ -1,138 +0,0 @@
1From 7a3bbca81b803ba116b83c82de378e840cc35f81 Mon Sep 17 00:00:00 2001
2From: Paul Eggert <eggert@cs.ucla.edu>
3Date: Thu, 1 Sep 2022 16:19:50 -0500
4Subject: [PATCH] Port to compilers that moan about K&R func decls
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9* lib/autoconf/c.m4 (AC_LANG_CALL, AC_LANG_FUNC_LINK_TRY):
10Use '(void)' rather than '()' in function prototypes, as the latter
11provokes fatal errors in some compilers nowadays.
12* lib/autoconf/functions.m4 (AC_FUNC_STRTOD):
13* tests/fortran.at (AC_F77_DUMMY_MAIN usage):
14* tests/semantics.at (AC_CHECK_DECLS):
15Don’t use () in a function decl.
16
17Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=8b5e2016c7ed2d67f31b03a3d2e361858ff5299b]
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 doc/autoconf.texi | 7 +++----
21 lib/autoconf/c.m4 | 6 +++---
22 lib/autoconf/functions.m4 | 3 ---
23 tests/fortran.at | 8 ++++----
24 tests/semantics.at | 2 +-
25 5 files changed, 11 insertions(+), 15 deletions(-)
26
27--- a/doc/autoconf.texi
28+++ b/doc/autoconf.texi
29@@ -5465,9 +5465,7 @@ the @samp{#undef malloc}):
30 #include <config.h>
31 #undef malloc
32
33-#include <sys/types.h>
34-
35-void *malloc ();
36+#include <stdlib.h>
37
38 /* Allocate an N-byte block of memory from the heap.
39 If N is zero, allocate a 1-byte block. */
40@@ -8295,7 +8293,7 @@ needed:
41 # ifdef __cplusplus
42 extern "C"
43 # endif
44- int F77_DUMMY_MAIN () @{ return 1; @}
45+ int F77_DUMMY_MAIN (void) @{ return 1; @}
46 #endif
47 @end example
48
49--- a/lib/autoconf/c.m4
50+++ b/lib/autoconf/c.m4
51@@ -127,7 +127,7 @@ m4_if([$2], [main], ,
52 [/* Override any GCC internal prototype to avoid an error.
53 Use char because int might match the return type of a GCC
54 builtin and then its argument prototype would still apply. */
55-char $2 ();])], [return $2 ();])])
56+char $2 (void);])], [return $2 ();])])
57
58
59 # AC_LANG_FUNC_LINK_TRY(C)(FUNCTION)
60@@ -151,7 +151,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
61 #define $1 innocuous_$1
62
63 /* System header to define __stub macros and hopefully few prototypes,
64- which can conflict with char $1 (); below. */
65+ which can conflict with char $1 (void); below. */
66
67 #include <limits.h>
68 #undef $1
69@@ -162,7 +162,7 @@ m4_define([AC_LANG_FUNC_LINK_TRY(C)],
70 #ifdef __cplusplus
71 extern "C"
72 #endif
73-char $1 ();
74+char $1 (void);
75 /* The GNU C library defines this for functions which it implements
76 to always fail with ENOSYS. Some functions are actually named
77 something starting with __ and the normal name is an alias. */
78--- a/lib/autoconf/functions.m4
79+++ b/lib/autoconf/functions.m4
80@@ -1601,9 +1601,6 @@ AC_DEFUN([AC_FUNC_STRTOD],
81 AC_CACHE_CHECK(for working strtod, ac_cv_func_strtod,
82 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
83 ]AC_INCLUDES_DEFAULT[
84-#ifndef strtod
85-double strtod ();
86-#endif
87 int
88 main (void)
89 {
90--- a/tests/fortran.at
91+++ b/tests/fortran.at
92@@ -233,7 +233,7 @@ void FOOBAR_F77 (double *x, double *y);
93 # ifdef __cplusplus
94 extern "C"
95 # endif
96- int F77_DUMMY_MAIN () { return 1; }
97+ int F77_DUMMY_MAIN (void) { return 1; }
98 #endif
99
100 int main(int argc, char *argv[])
101@@ -315,7 +315,7 @@ void FOOBAR_FC(double *x, double *y);
102 # ifdef __cplusplus
103 extern "C"
104 # endif
105- int FC_DUMMY_MAIN () { return 1; }
106+ int FC_DUMMY_MAIN (void) { return 1; }
107 #endif
108
109 int main (int argc, char *argv[])
110@@ -561,7 +561,7 @@ void @foobar@ (int *x);
111 # ifdef __cplusplus
112 extern "C"
113 # endif
114- int F77_DUMMY_MAIN () { return 1; }
115+ int F77_DUMMY_MAIN (void) { return 1; }
116 #endif
117
118 int main(int argc, char *argv[])
119@@ -637,7 +637,7 @@ void @foobar@ (int *x);
120 # ifdef __cplusplus
121 extern "C"
122 # endif
123- int FC_DUMMY_MAIN () { return 1; }
124+ int FC_DUMMY_MAIN (void) { return 1; }
125 #endif
126
127 int main(int argc, char *argv[])
128--- a/tests/semantics.at
129+++ b/tests/semantics.at
130@@ -207,7 +207,7 @@ AT_CHECK_MACRO([AC_CHECK_DECLS],
131 [[extern int yes;
132 enum { myenum };
133 extern struct mystruct_s { int x[20]; } mystruct;
134- extern int myfunc();
135+ extern int myfunc (int);
136 #define mymacro1(arg) arg
137 #define mymacro2]])
138 # Ensure we can detect missing declarations of functions whose
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.71.bb b/meta/recipes-devtools/autoconf/autoconf_2.72c.bb
index 97c241a3f5..fe9779e4dd 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.71.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.72c.bb
@@ -11,18 +11,18 @@ DEPENDS:remove:class-native = "autoconf-native automake-native help2man-native"
11LIC_FILES_CHKSUM = "file://COPYING;md5=cc3f3a7596cb558bbd9eb7fbaa3ef16c \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=cc3f3a7596cb558bbd9eb7fbaa3ef16c \
12 file://COPYINGv3;md5=1ebbd3e34237af26da5dc08a4e440464" 12 file://COPYINGv3;md5=1ebbd3e34237af26da5dc08a4e440464"
13 13
14SRC_URI = "${GNU_MIRROR}/autoconf/${BP}.tar.gz \ 14SRC_URI = " \
15 https://alpha.gnu.org/gnu/autoconf/autoconf-2.72c.tar.gz \
15 file://program_prefix.patch \ 16 file://program_prefix.patch \
16 file://autoreconf-exclude.patch \ 17 file://autoreconf-exclude.patch \
17 file://remove-usr-local-lib-from-m4.patch \ 18 file://remove-usr-local-lib-from-m4.patch \
18 file://preferbash.patch \ 19 file://preferbash.patch \
19 file://autotest-automake-result-format.patch \ 20 file://autotest-automake-result-format.patch \
20 file://man-host-perl.patch \ 21 file://man-host-perl.patch \
21 file://0001-Port-to-compilers-that-moan-about-K-R-func-decls.patch \
22 " 22 "
23SRC_URI:append:class-native = " file://no-man.patch" 23SRC_URI:append:class-native = " file://no-man.patch"
24 24
25SRC_URI[sha256sum] = "431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c" 25SRC_URI[sha256sum] = "21b64169c820c6cdf27fc981ca9c2fb615546e5dead92bccf8d92d0784cdd364"
26 26
27RDEPENDS:${PN} = "m4 gnu-config \ 27RDEPENDS:${PN} = "m4 gnu-config \
28 perl \ 28 perl \
diff --git a/meta/recipes-devtools/bison/bison/autoconf-2.73.patch b/meta/recipes-devtools/bison/bison/autoconf-2.73.patch
new file mode 100644
index 0000000000..8360d3928f
--- /dev/null
+++ b/meta/recipes-devtools/bison/bison/autoconf-2.73.patch
@@ -0,0 +1,24 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next bison upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: findutils-4.9.0/gl/m4/largefile.m4
13===================================================================
14--- findutils-4.9.0.orig/m4/largefile.m4
15+++ findutils-4.9.0/m4/largefile.m4
16@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
17 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
18 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
19 # or configures them incorrectly in some cases.
20-m4_version_prereq([2.70], [], [
21+m4_version_prereq([2.73], [], [
22
23 # _AC_SYS_LARGEFILE_TEST_INCLUDES
24 # -------------------------------
diff --git a/meta/recipes-devtools/bison/bison_3.8.2.bb b/meta/recipes-devtools/bison/bison_3.8.2.bb
index c95f321244..da138e3587 100644
--- a/meta/recipes-devtools/bison/bison_3.8.2.bb
+++ b/meta/recipes-devtools/bison/bison_3.8.2.bb
@@ -10,6 +10,7 @@ SECTION = "devel"
10DEPENDS = "bison-native flex-native" 10DEPENDS = "bison-native flex-native"
11 11
12SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ 12SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.xz \
13 file://autoconf-2.73.patch \
13 file://add-with-bisonlocaledir.patch \ 14 file://add-with-bisonlocaledir.patch \
14 " 15 "
15SRC_URI[sha256sum] = "9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2" 16SRC_URI[sha256sum] = "9bba0214ccf7f1079c5d59210045227bcf619519840ebfa80cd3849cff5a5bf2"
diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc
index ddcc05750b..03cf2a8d72 100644
--- a/meta/recipes-extended/findutils/findutils.inc
+++ b/meta/recipes-extended/findutils/findutils.inc
@@ -7,6 +7,7 @@ BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils"
7SECTION = "console/utils" 7SECTION = "console/utils"
8 8
9SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \ 9SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \
10 file://autoconf-2.73.patch \
10 file://run-ptest \ 11 file://run-ptest \
11 " 12 "
12 13
diff --git a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch b/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch
new file mode 100644
index 0000000000..63728b5f91
--- /dev/null
+++ b/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch
@@ -0,0 +1,24 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next findutils upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: findutils-4.9.0/gl/m4/largefile.m4
13===================================================================
14--- findutils-4.9.0.orig/gl/m4/largefile.m4
15+++ findutils-4.9.0/gl/m4/largefile.m4
16@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
17 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
18 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
19 # or configures them incorrectly in some cases.
20-m4_version_prereq([2.70], [], [
21+m4_version_prereq([2.73], [], [
22
23 # _AC_SYS_LARGEFILE_TEST_INCLUDES
24 # -------------------------------
diff --git a/meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch b/meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch
new file mode 100644
index 0000000000..18f992beb8
--- /dev/null
+++ b/meta/recipes-extended/gzip/gzip-1.12/autoconf-2.73.patch
@@ -0,0 +1,24 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next gzip upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: findutils-4.9.0/gl/m4/largefile.m4
13===================================================================
14--- findutils-4.9.0.orig/m4/largefile.m4
15+++ findutils-4.9.0/m4/largefile.m4
16@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
17 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
18 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
19 # or configures them incorrectly in some cases.
20-m4_version_prereq([2.70], [], [
21+m4_version_prereq([2.73], [], [
22
23 # _AC_SYS_LARGEFILE_TEST_INCLUDES
24 # -------------------------------
diff --git a/meta/recipes-extended/gzip/gzip_1.12.bb b/meta/recipes-extended/gzip/gzip_1.12.bb
index 14de50b230..35eb7c4da2 100644
--- a/meta/recipes-extended/gzip/gzip_1.12.bb
+++ b/meta/recipes-extended/gzip/gzip_1.12.bb
@@ -5,6 +5,7 @@ require gzip.inc
5LICENSE = "GPL-3.0-or-later" 5LICENSE = "GPL-3.0-or-later"
6 6
7SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \ 7SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz \
8 file://autoconf-2.73.patch \
8 file://run-ptest \ 9 file://run-ptest \
9 " 10 "
10SRC_URI:append:class-target = " file://wrong-path-fix.patch" 11SRC_URI:append:class-target = " file://wrong-path-fix.patch"
diff --git a/meta/recipes-extended/libarchive/libarchive/configurehack.patch b/meta/recipes-extended/libarchive/libarchive/configurehack.patch
new file mode 100644
index 0000000000..f3989d99eb
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/configurehack.patch
@@ -0,0 +1,49 @@
1To work with autoconf 2.73, tweak the macro ordering in configure.in.
2
3Upstream-Status: Pending
4Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5
6Index: libarchive-3.6.2/configure.ac
7===================================================================
8--- libarchive-3.6.2.orig/configure.ac
9+++ libarchive-3.6.2/configure.ac
10@@ -357,6 +357,19 @@ if test "x$with_bz2lib" != "xno"; then
11 esac
12 fi
13
14+# Checks for typedefs, structures, and compiler characteristics.
15+AC_C_CONST
16+# la_TYPE_UID_T defaults to "int", which is incorrect for MinGW
17+# and MSVC. Use a customized version.
18+la_TYPE_UID_T
19+AC_TYPE_MODE_T
20+# AC_TYPE_OFF_T defaults to "long", which limits us to 4GB files on
21+# most systems... default to "long long" instead.
22+AC_CHECK_TYPE(off_t, [long long])
23+AC_TYPE_SIZE_T
24+AC_CHECK_TYPE(id_t, [unsigned long])
25+AC_CHECK_TYPE(uintptr_t, [unsigned int])
26+
27 AC_ARG_WITH([libb2],
28 AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2]))
29
30@@ -558,19 +571,6 @@ LDFLAGS=$save_LDFLAGS
31
32 AC_SUBST(GC_SECTIONS)
33
34-# Checks for typedefs, structures, and compiler characteristics.
35-AC_C_CONST
36-# la_TYPE_UID_T defaults to "int", which is incorrect for MinGW
37-# and MSVC. Use a customized version.
38-la_TYPE_UID_T
39-AC_TYPE_MODE_T
40-# AC_TYPE_OFF_T defaults to "long", which limits us to 4GB files on
41-# most systems... default to "long long" instead.
42-AC_CHECK_TYPE(off_t, [long long])
43-AC_TYPE_SIZE_T
44-AC_CHECK_TYPE(id_t, [unsigned long])
45-AC_CHECK_TYPE(uintptr_t, [unsigned int])
46-
47 # Check for tm_gmtoff in struct tm
48 AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,
49 [
diff --git a/meta/recipes-extended/libarchive/libarchive_3.6.2.bb b/meta/recipes-extended/libarchive/libarchive_3.6.2.bb
index aafede3da8..bf14725dc1 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.6.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.6.2.bb
@@ -29,6 +29,7 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd,"
29EXTRA_OECONF += "--enable-largefile --without-iconv" 29EXTRA_OECONF += "--enable-largefile --without-iconv"
30 30
31SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz" 31SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz"
32SRC_URI += "file://configurehack.patch"
32UPSTREAM_CHECK_URI = "http://libarchive.org/" 33UPSTREAM_CHECK_URI = "http://libarchive.org/"
33 34
34SRC_URI[sha256sum] = "ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3" 35SRC_URI[sha256sum] = "ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3"
diff --git a/meta/recipes-extended/libpipeline/libpipeline/autoconf-2.73.patch b/meta/recipes-extended/libpipeline/libpipeline/autoconf-2.73.patch
new file mode 100644
index 0000000000..e61e5aa869
--- /dev/null
+++ b/meta/recipes-extended/libpipeline/libpipeline/autoconf-2.73.patch
@@ -0,0 +1,24 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next libpipeline upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: findutils-4.9.0/gl/m4/largefile.m4
13===================================================================
14--- findutils-4.9.0.orig/gl/m4/largefile.m4
15+++ findutils-4.9.0/gl/m4/largefile.m4
16@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
17 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
18 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
19 # or configures them incorrectly in some cases.
20-m4_version_prereq([2.70], [], [
21+m4_version_prereq([2.73], [], [
22
23 # _AC_SYS_LARGEFILE_TEST_INCLUDES
24 # -------------------------------
diff --git a/meta/recipes-extended/libpipeline/libpipeline_1.5.7.bb b/meta/recipes-extended/libpipeline/libpipeline_1.5.7.bb
index 73c7aaaa91..7e3f13ebde 100644
--- a/meta/recipes-extended/libpipeline/libpipeline_1.5.7.bb
+++ b/meta/recipes-extended/libpipeline/libpipeline_1.5.7.bb
@@ -7,6 +7,7 @@ LICENSE = "GPL-3.0-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" 7LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
8 8
9SRC_URI = "${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz" 9SRC_URI = "${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz"
10SRC_URI += "file://autoconf-2.73.patch"
10SRC_URI[sha256sum] = "b8b45194989022a79ec1317f64a2a75b1551b2a55bea06f67704cb2a2e4690b0" 11SRC_URI[sha256sum] = "b8b45194989022a79ec1317f64a2a75b1551b2a55bea06f67704cb2a2e4690b0"
11 12
12inherit pkgconfig autotools 13inherit pkgconfig autotools
diff --git a/meta/recipes-extended/man-db/files/autoconf-2.73.patch b/meta/recipes-extended/man-db/files/autoconf-2.73.patch
new file mode 100644
index 0000000000..6c997a68e6
--- /dev/null
+++ b/meta/recipes-extended/man-db/files/autoconf-2.73.patch
@@ -0,0 +1,24 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next man-db upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12Index: findutils-4.9.0/gl/m4/largefile.m4
13===================================================================
14--- findutils-4.9.0.orig/gl/m4/largefile.m4
15+++ findutils-4.9.0/gl/m4/largefile.m4
16@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
17 # with _TIME_BITS. Also, work around a problem in autoconf <= 2.69:
18 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
19 # or configures them incorrectly in some cases.
20-m4_version_prereq([2.70], [], [
21+m4_version_prereq([2.73], [], [
22
23 # _AC_SYS_LARGEFILE_TEST_INCLUDES
24 # -------------------------------
diff --git a/meta/recipes-extended/man-db/man-db_2.11.2.bb b/meta/recipes-extended/man-db/man-db_2.11.2.bb
index ca0cb1a0e1..3884a531a6 100644
--- a/meta/recipes-extended/man-db/man-db_2.11.2.bb
+++ b/meta/recipes-extended/man-db/man-db_2.11.2.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
10SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \ 10SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz \
11 file://99_mandb \ 11 file://99_mandb \
12 file://0001-man-Move-local-variable-declaration-to-function-scop.patch \ 12 file://0001-man-Move-local-variable-declaration-to-function-scop.patch \
13 file://autoconf-2.73.patch \
13 file://man_db.conf-avoid-multilib-install-file-conflict.patch" 14 file://man_db.conf-avoid-multilib-install-file-conflict.patch"
14SRC_URI[sha256sum] = "cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d" 15SRC_URI[sha256sum] = "cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d"
15 16
diff --git a/meta/recipes-extended/parted/files/autoconf-2.73.patch b/meta/recipes-extended/parted/files/autoconf-2.73.patch
new file mode 100644
index 0000000000..63dea88bfc
--- /dev/null
+++ b/meta/recipes-extended/parted/files/autoconf-2.73.patch
@@ -0,0 +1,22 @@
1The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
2than the full code:
3
4https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
5
6Just tweak the exiting code to work with 2.73. The next parted upgrade should
7update to new gnulib
8
9Upstream-Status: Inappropriate
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11
12--- a/m4/largefile.m4
13+++ b/m4/largefile.m4
14@@ -27,7 +27,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
15 # Work around a problem in autoconf <= 2.69:
16 # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
17 # or configures them incorrectly in some cases.
18-m4_version_prereq([2.70], [], [
19+m4_version_prereq([2.73], [], [
20
21 # _AC_SYS_LARGEFILE_TEST_INCLUDES
22 # -------------------------------
diff --git a/meta/recipes-extended/parted/parted_3.6.bb b/meta/recipes-extended/parted/parted_3.6.bb
index a755e1c148..a537ef74db 100644
--- a/meta/recipes-extended/parted/parted_3.6.bb
+++ b/meta/recipes-extended/parted/parted_3.6.bb
@@ -9,6 +9,7 @@ DEPENDS = "ncurses util-linux virtual/libiconv"
9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ 9SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \
10 file://fix-doc-mandir.patch \ 10 file://fix-doc-mandir.patch \
11 file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \ 11 file://0001-fs-Add-libuuid-to-linker-flags-for-libparted-fs-resi.patch \
12 file://autoconf-2.73.patch \
12 file://run-ptest \ 13 file://run-ptest \
13 " 14 "
14 15
diff --git a/meta/recipes-support/apr/apr/autoconf-2.73.patch b/meta/recipes-support/apr/apr/autoconf-2.73.patch
new file mode 100644
index 0000000000..a8b7a77566
--- /dev/null
+++ b/meta/recipes-support/apr/apr/autoconf-2.73.patch
@@ -0,0 +1,26 @@
1To work with autoconf 2.73, tweak the macro ordering in configure.in.
2
3Upstream-Status: Pending
4Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5
6Index: apr-1.7.2/configure.in
7===================================================================
8--- apr-1.7.2.orig/configure.in
9+++ apr-1.7.2/configure.in
10@@ -430,6 +430,8 @@ if test "$host" = "i586-pc-beos"; then
11 ) dnl
12 fi
13
14+APR_CHECK_DEFINE(LOCK_EX, sys/file.h)
15+
16 # this is the place to put specific options for platform/compiler
17 # combinations
18 case "$host:$CC" in
19@@ -2384,7 +2386,6 @@ AC_MSG_RESULT([$msg])
20 AC_SUBST(have_union_semun)
21
22 dnl Checks for libraries.
23-APR_CHECK_DEFINE(LOCK_EX, sys/file.h)
24 APR_CHECK_DEFINE(F_SETLK, fcntl.h)
25 APR_CHECK_DEFINE(SEM_UNDO, sys/sem.h)
26
diff --git a/meta/recipes-support/apr/apr_1.7.4.bb b/meta/recipes-support/apr/apr_1.7.4.bb
index e571469341..5ac7f4b93f 100644
--- a/meta/recipes-support/apr/apr_1.7.4.bb
+++ b/meta/recipes-support/apr/apr_1.7.4.bb
@@ -22,6 +22,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
22 file://libtoolize_check.patch \ 22 file://libtoolize_check.patch \
23 file://0001-Add-option-to-disable-timed-dependant-tests.patch \ 23 file://0001-Add-option-to-disable-timed-dependant-tests.patch \
24 file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ 24 file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \
25 file://autoconf-2.73.patch \
25 " 26 "
26 27
27SRC_URI[sha256sum] = "fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577" 28SRC_URI[sha256sum] = "fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577"