summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libarchive
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 /meta/recipes-extended/libarchive
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>
Diffstat (limited to 'meta/recipes-extended/libarchive')
-rw-r--r--meta/recipes-extended/libarchive/libarchive/configurehack.patch49
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.6.2.bb1
2 files changed, 50 insertions, 0 deletions
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"