summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libarchive/libarchive/configurehack.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/libarchive/libarchive/configurehack.patch')
-rw-r--r--meta/recipes-extended/libarchive/libarchive/configurehack.patch55
1 files changed, 55 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..45fddd9147
--- /dev/null
+++ b/meta/recipes-extended/libarchive/libarchive/configurehack.patch
@@ -0,0 +1,55 @@
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---
6 configure.ac | 26 +++++++++++++-------------
7 1 file changed, 13 insertions(+), 13 deletions(-)
8
9diff --git a/configure.ac b/configure.ac
10index 503bb75..e3101da 100644
11--- a/configure.ac
12+++ b/configure.ac
13@@ -414,6 +414,19 @@ if test "x$with_bz2lib" != "xno"; then
14 esac
15 fi
16
17+# Checks for typedefs, structures, and compiler characteristics.
18+AC_C_CONST
19+# la_TYPE_UID_T defaults to "int", which is incorrect for MinGW
20+# and MSVC. Use a customized version.
21+la_TYPE_UID_T
22+AC_TYPE_MODE_T
23+# AC_TYPE_OFF_T defaults to "long", which limits us to 4GB files on
24+# most systems... default to "long long" instead.
25+AC_CHECK_TYPE(off_t, [long long])
26+AC_TYPE_SIZE_T
27+AC_CHECK_TYPE(id_t, [unsigned long])
28+AC_CHECK_TYPE(uintptr_t, [unsigned int])
29+
30 AC_ARG_WITH([libb2],
31 AS_HELP_STRING([--without-libb2], [Don't build support for BLAKE2 through libb2]))
32
33@@ -678,19 +691,6 @@ fi
34
35 AC_SUBST(DEAD_CODE_REMOVAL)
36
37-# Checks for typedefs, structures, and compiler characteristics.
38-AC_C_CONST
39-# la_TYPE_UID_T defaults to "int", which is incorrect for MinGW
40-# and MSVC. Use a customized version.
41-la_TYPE_UID_T
42-AC_TYPE_MODE_T
43-# AC_TYPE_OFF_T defaults to "long", which limits us to 4GB files on
44-# most systems... default to "long long" instead.
45-AC_CHECK_TYPE(off_t, [long long])
46-AC_TYPE_SIZE_T
47-AC_CHECK_TYPE(id_t, [unsigned long])
48-AC_CHECK_TYPE(uintptr_t, [unsigned int])
49-
50 # Check for tm_gmtoff in struct tm
51 AC_CHECK_MEMBERS([struct tm.tm_gmtoff, struct tm.__tm_gmtoff],,,
52 [
53--
542.34.1
55