From 2bd66eb3a3ea508a723071b8556cdc3cc10a379b Mon Sep 17 00:00:00 2001 From: GavinZhang Date: Tue, 11 Oct 2022 13:49:07 +0800 Subject: [PATCH 1/3] update meson.build to make it works on i --- meson.build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meson.build b/meson.build index b12bdefb81aa..25eb841942a1 100644 --- a/meson.build +++ b/meson.build @@ -50,6 +50,13 @@ m_dep = cc.find_library('m', required : false) if m_dep.found() add_project_link_arguments('-lm', language : 'c') endif +if host_machine.system() == 'os400' + add_global_arguments('-pthread', language : 'cpp') + add_global_arguments('-D__STDC_FORMAT_MACROS', language : 'cpp') + add_project_link_arguments('-Wl,-bnotextro', language : 'c') + add_project_link_arguments('-Wl,-bnotextro', language : 'cpp') + add_project_link_arguments('-Wl,-bnotextro', language : 'fortran') +endif # Adding at project level causes many spurious -lgfortran flags. add_languages('fortran', native: false) From 39e5559390376accdf6fe0bb103ebf64500ee864 Mon Sep 17 00:00:00 2001 From: GavinZhang Date: Wed, 12 Oct 2022 16:36:29 +0800 Subject: [PATCH 2/3] remove the pthread per the fix #17200 from Ralf Gommers --- meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 25eb841942a1..38cb09019bc8 100644 --- a/meson.build +++ b/meson.build @@ -51,8 +51,7 @@ if m_dep.found() add_project_link_arguments('-lm', language : 'c') endif if host_machine.system() == 'os400' - add_global_arguments('-pthread', language : 'cpp') - add_global_arguments('-D__STDC_FORMAT_MACROS', language : 'cpp') + add_project_arguments('-D__STDC_FORMAT_MACROS', language : 'cpp') add_project_link_arguments('-Wl,-bnotextro', language : 'c') add_project_link_arguments('-Wl,-bnotextro', language : 'cpp') add_project_link_arguments('-Wl,-bnotextro', language : 'fortran') From 974296be27bd736d679b44900883fd5991415c7e Mon Sep 17 00:00:00 2001 From: Ralf Gommers Date: Wed, 12 Oct 2022 14:34:58 +0200 Subject: [PATCH 3/3] DOC: add comment to refer to more details for IBM i build issue [ci skip] --- meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meson.build b/meson.build index 38cb09019bc8..3f04a1f6c1e2 100644 --- a/meson.build +++ b/meson.build @@ -50,7 +50,9 @@ m_dep = cc.find_library('m', required : false) if m_dep.found() add_project_link_arguments('-lm', language : 'c') endif + if host_machine.system() == 'os400' + # IBM i system, needed to avoid build errors - see gh-17193 add_project_arguments('-D__STDC_FORMAT_MACROS', language : 'cpp') add_project_link_arguments('-Wl,-bnotextro', language : 'c') add_project_link_arguments('-Wl,-bnotextro', language : 'cpp')