add upstream patches to fix build on 32bit architectures
Rene Engelhard
3 years ago
|
0 |
liborcus (0.16.0-2) experimental; urgency=medium
|
|
1 |
|
|
2 |
* add upstream patches to fix build on 32bit architectures
|
|
3 |
|
|
4 |
-- Rene Engelhard <rene@debian.org> Fri, 25 Sep 2020 06:34:23 +0200
|
|
5 |
|
| 0 | 6 |
liborcus (0.16.0-1) experimental; urgency=medium
|
| 1 | 7 |
|
| 2 | 8 |
* New upstream version 0.16.0
|
|
0 |
From 2f3fa91679b449d3079152fb847c71350815df49 Mon Sep 17 00:00:00 2001
|
|
1 |
From: Kohei Yoshida <kohei.yoshida@gmail.com>
|
|
2 |
Date: Thu, 24 Sep 2020 20:06:53 -0400
|
|
3 |
Subject: [PATCH 1/2] Don't forget to initialize this struct member.
|
|
4 |
|
|
5 |
This ended up becoming "true" on a 32-bit debian platform, though
|
|
6 |
this is not strictly a 32-bit build issue...
|
|
7 |
|
|
8 |
Related to #129.
|
|
9 |
---
|
|
10 |
src/parser/parser_global.cpp | 1 +
|
|
11 |
1 file changed, 1 insertion(+)
|
|
12 |
|
|
13 |
diff --git a/src/parser/parser_global.cpp b/src/parser/parser_global.cpp
|
|
14 |
index 4699a17b..a98d3dbc 100644
|
|
15 |
--- a/src/parser/parser_global.cpp
|
|
16 |
+++ b/src/parser/parser_global.cpp
|
|
17 |
@@ -155,6 +155,7 @@ parse_quoted_string_state parse_string_with_escaped_char(
|
|
18 |
ret.str = nullptr;
|
|
19 |
ret.length = 0;
|
|
20 |
ret.transient = true;
|
|
21 |
+ ret.has_control_character = false;
|
|
22 |
|
|
23 |
// Start the buffer with the string we've parsed so far.
|
|
24 |
buffer.reset();
|
|
25 |
--
|
|
26 |
2.25.1
|
|
27 |
|
|
0 |
From 0eb2e3f7e81275a14958fa3cab900501c37c404c Mon Sep 17 00:00:00 2001
|
|
1 |
From: Kohei Yoshida <kohei.yoshida@gmail.com>
|
|
2 |
Date: Thu, 24 Sep 2020 19:28:48 -0400
|
|
3 |
Subject: [PATCH 2/2] Check the size of void* and pass it as a compiler define.
|
|
4 |
|
|
5 |
This is needed in order to link against libixion. Related to #129.
|
|
6 |
---
|
|
7 |
configure.ac | 3 +++
|
|
8 |
1 file changed, 3 insertions(+)
|
|
9 |
|
|
10 |
diff --git a/configure.ac b/configure.ac
|
|
11 |
index f69e7a12..caf82304 100644
|
|
12 |
--- a/configure.ac
|
|
13 |
+++ b/configure.ac
|
|
14 |
@@ -55,6 +55,9 @@ AC_C_INLINE
|
|
15 |
AC_TYPE_MODE_T
|
|
16 |
AC_TYPE_SIZE_T
|
|
17 |
|
|
18 |
+AC_CHECK_SIZEOF([void *])
|
|
19 |
+CXXFLAGS="$CXXFLAGS -DSIZEOF_VOID_P=$ac_cv_sizeof_void_p"
|
|
20 |
+
|
|
21 |
# ============================
|
|
22 |
# Checks for library functions
|
|
23 |
# ============================
|
|
24 |
--
|
|
25 |
2.25.1
|
|
26 |
|
|
0 |
0001-Don-t-forget-to-initialize-this-struct-member.patch
|
|
1 |
0002-Check-the-size-of-void-and-pass-it-as-a-compiler-def.patch
|