File 0001-Fix-cross-build-error-for-Windows-with-gcc... of Package mingw64-glib2

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-cross-build-error-for-Windows-with-gcc.patch of Package mingw64-glib2 (Revision b49839b890d3a39824c9b16727cfa18b)

Currently displaying revision b49839b890d3a39824c9b16727cfa18b , Show latest

From 74711f155a35cd2586076963cad1cd0f84aa9a38 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sat, 8 Jan 2022 10:13:26 +0100
Subject: [PATCH] Fix cross build error for Windows with gcc

This commit puts an additional underscore before the external symbol
`_g_binary_test1_resource_data` when using gcc for Windows, to match
the compiler's expectation.

Fixes #2571

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
---
 gio/tests/meson.build | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index f8cf7b655..8212f75da 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -734,11 +734,16 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
                  '-o','@OUTPUT@'])
 
     # Rename symbol to match the one in the C file
+    if cc.get_id() == 'gcc' and host_system == 'windows'
+      underscore = '_'
+    else
+      underscore = ''
+    endif
     test_resources_binary2 = custom_target('test_resources2.o',
       input : test_resources_binary,
       output : 'test_resources2.o',
       command : [objcopy,
-                 '--add-symbol','_g_binary_test1_resource_data=.data:0',
+                 '--add-symbol', underscore + '_g_binary_test1_resource_data=.data:0',
                  '@INPUT@',
                  '@OUTPUT@'])
 
-- 
2.26.2

Places

File 0001-Fix-cross-build-error-for-Windows-with-gcc.patch of Package mingw64-glib2 (Revision b49839b890d3a39824c9b16727cfa18b)

Places