File: 1063738-x32-compile-time-assert.patch

package info (click to toggle)
mariadb 1%3A11.8.3-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 772,520 kB
  • sloc: ansic: 2,414,714; cpp: 1,791,394; asm: 381,336; perl: 62,905; sh: 49,647; pascal: 40,897; java: 39,363; python: 20,791; yacc: 20,432; sql: 17,907; xml: 12,344; ruby: 8,544; cs: 6,542; makefile: 6,145; ada: 1,879; lex: 1,193; javascript: 996; objc: 80; tcl: 73; awk: 46; php: 22
file content (32 lines) | stat: -rw-r--r-- 1,103 bytes parent folder | download | duplicates (2) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
 
From: Otto Kekalainen <otto@debian.org>
Date: Thu, 4 Jul 2024 00:03:58 -0700
Subject: Make compile_time_assert compatible with x32 (Closes: #1063738)

The x32 build was failing on:

    compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);

Reported upstream at https://jira.mariadb.org/browse/MDEV-34195.
This is a regression from upstream commits c432c9ef and 06a884a57071.

Fix is based on advice from https://lists.debian.org/debian-amd64/2024/07/msg00003.html
which is also aligned with https://wiki.debian.org/X32Port.

Forwarded: no
---
 tests/mysql_client_fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c
index 1c71ac8..e192287 100644
--- a/tests/mysql_client_fw.c
+++ b/tests/mysql_client_fw.c
@@ -1444,7 +1444,7 @@ int main(int argc, char **argv)
 */
 #if defined _M_AMD64
   compile_time_assert(sizeof(MYSQL) == 1208);
-#elif defined __x86_64__
+#elif defined(__x86_64__) && !defined(__ILP32__)
   compile_time_assert(sizeof(MYSQL) == 1272);
 #elif defined __i386__
   compile_time_assert(sizeof(MYSQL) == 964);