开源软件构建与测试

Changes of Revision 15

_service:tar_scm:cpp17_filesystem_namespace.patch Changed

@@ -1,3 +1,16 @@
+diff --git a/meson.build b/meson.build
+index 4d26af3..77e0628 100644
+--- a/meson.build
++++ b/meson.build
+@@ -2316,6 +2316,8 @@ if dep_dl.found()
+   gl_priv_libs += '-ldl'
+ endif
+ 
++_filelibs = cpp.get_supported_arguments(['-lstdc++', '-lstdc++fs'])
++
+ # FIXME: autotools lists this as incomplete
+ gbm_priv_libs = []
+ if dep_dl.found()
 diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp
 index 80bc848..2a773ad 100644
 --- a/src/compiler/clc/clc_helpers.cpp
@@ -32,23 +45,16 @@
  
  /* Use the highest version of SPIRV supported by SPIRV-Tools. */
  constexpr spv_target_env spirv_target = SPV_ENV_UNIVERSAL_1_5;
-diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build
-index caae07e..79a10dd 100644
---- a/src/compiler/clc/meson.build
-+++ b/src/compiler/clc/meson.build
-@@ -59,12 +59,14 @@ if dep_llvm.version().version_compare('>= 14.0')
-   _libclc_cpp_args += ['-DHAS_SPIRV_1_4=1']
- endif
- 
-+_libclc_filesystem = cpp.get_supported_arguments(['-lstdc++', '-lstdc++fs'])
-+
- _libclc = static_library(
-   'libclc',
-   files_libclc,
-   sources: _libclc_sources,
-   include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_compiler, inc_spirv],
--  cpp_args : _libclc_cpp_args,
-+  cpp_args : [_libclc_cpp_args,  _libclc_filesystem],
-   dependencies: [idep_nir_headers, dep_clang, dep_llvm, dep_llvmspirvlib,
-                  idep_mesautil, idep_nir, dep_spirv_tools]
- )
+diff --git a/src/meson.build b/src/meson.build
+index e551045..58ad273 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -150,7 +150,7 @@ if with_glx != 'disabled' and not with_glvnd
+     description : 'Mesa OpenGL Library',
+     version : meson.project_version(),
+     libraries : libgl,
+-    libraries_private : gl_priv_libs,
++    libraries_private : [gl_priv_libs, _filelibs],
+     requires_private : gl_priv_reqs,
+     variables : ['glx_tls=yes'],
+   )

_service Changed