开源软件构建与测试

Changes of Revision 13

_service:tar_scm:cpp17_filesystem_namespace.patch Changed

@@ -1,12 +1,20 @@
 diff --git a/src/compiler/clc/clc_helpers.cpp b/src/compiler/clc/clc_helpers.cpp
-index 80bc848..6051feb 100644
+index 80bc848..2a773ad 100644
 --- a/src/compiler/clc/clc_helpers.cpp
 +++ b/src/compiler/clc/clc_helpers.cpp
-@@ -23,7 +23,20 @@
+@@ -23,7 +23,6 @@
  // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  // OTHER DEALINGS IN THE SOFTWARE.
  
 -#include <filesystem>
+ #include <sstream>
+ #include <mutex>
+ 
+@@ -65,7 +64,20 @@
+ 
+ #include "clc_helpers.h"
+ 
+-namespace fs = std::filesystem;
 +#ifndef __has_include
 +  static_assert(false, "__has_include not supported");
 +#else
@@ -21,15 +29,26 @@
 +     namespace fs = boost::filesystem;
 +#  endif
 +#endif
- #include <sstream>
- #include <mutex>
- 
-@@ -65,7 +78,6 @@
- 
- #include "clc_helpers.h"
- 
--namespace fs = std::filesystem;
  
  /* Use the highest version of SPIRV supported by SPIRV-Tools. */
  constexpr spv_target_env spirv_target = SPV_ENV_UNIVERSAL_1_5;
- 
\ No newline at end of file
+diff --git a/src/compiler/clc/meson.build b/src/compiler/clc/meson.build
+index caae07e..2ef429a 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
+ )

_service Changed