From cc1add40db676a5e4f5c8aa07a5b2cb5a7125d16 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Fri, 28 Jun 2024 23:46:18 +0200 Subject: [PATCH 1/2] build system: kepp flag "-stdlib=libc++" private in pkg-config files --- src/libs/core/meson.build | 17 ++++++++--------- src/libs/recordings/meson.build | 13 +++++++++++-- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/libs/core/meson.build b/src/libs/core/meson.build index 186ade85..b0799564 100644 --- a/src/libs/core/meson.build +++ b/src/libs/core/meson.build @@ -21,11 +21,18 @@ liboopetris_core = library( version: meson.project_version(), install: true, ) +## remove '-stdlib=libc++' from the list, if it's present +core_dep_compile_args = [] +foreach value : core_lib.get('compile_args') + if value != '-stdlib=libc++' + core_dep_compile_args += value + endif +endforeach liboopetris_core_dep = declare_dependency( link_with: liboopetris_core, include_directories: core_lib.get('inc_dirs'), - compile_args: core_lib.get('compile_args'), + compile_args: core_dep_compile_args, dependencies: core_lib.get('deps'), version: meson.project_version(), ) @@ -37,14 +44,6 @@ install_headers( preserve_path: true, ) -## remove '-stdlib=libc++' from the list, if it's present -core_dep_compile_args = [] -foreach value : core_lib.get('compile_args') - if value != '-stdlib=libc++' - core_dep_compile_args += value - endif -endforeach - # generate pkgconfig files pkg = import('pkgconfig') diff --git a/src/libs/recordings/meson.build b/src/libs/recordings/meson.build index af6148fc..d515072e 100644 --- a/src/libs/recordings/meson.build +++ b/src/libs/recordings/meson.build @@ -25,10 +25,19 @@ liboopetris_recordings = library( install: true, ) +## remove '-stdlib=libc++' from the list, if it's present +recordings_dep_compile_args = [] +foreach value : recordings_lib.get('compile_args') + if value != '-stdlib=libc++' + recordings_dep_compile_args += value + endif +endforeach + + liboopetris_recordings_dep = declare_dependency( link_with: liboopetris_recordings, include_directories: recordings_lib.get('inc_dirs'), - compile_args: recordings_lib.get('compile_args'), + compile_args: recordings_dep_compile_args, dependencies: recordings_lib.get('deps'), version: meson.project_version(), ) @@ -48,7 +57,7 @@ pkg.generate( name: 'oopetris-recordings', filebase: 'oopetris-recordings', subdirs: 'oopetris', - extra_cflags: recordings_lib.get('compile_args'), + extra_cflags: recordings_dep_compile_args, variables: ['compiler=' + pkg_cpp_compiler, 'cpp_stdlib=' + pkg_cpp_stdlib], ) From 5a7db3c23c840058962585d0eb8704221e538933 Mon Sep 17 00:00:00 2001 From: Totto16 Date: Sat, 29 Jun 2024 00:00:56 +0200 Subject: [PATCH 2/2] CI: small newline fix --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ed1f175..d3d5fb81 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,6 @@ jobs: library_type: static shell: "msys2 {0}" - - name: Linux Release os: ubuntu os-version: 24.04