feature: update build

Change-Id: If30bc6e1ae14e1151af8286901df1908dd669127

ohos/meson_cross_process_x86.py

@@ -30,7 +30,7 @@ project_stub = 'project_stub'
 
 corss_file_content='''
 [properties]
-needs_exe_wrapper = true
+needs_exe_wrapper = false
 
 c_args = [
     '-march=x86-64',
@@ -69,7 +69,7 @@ cpp_link_args = [
     '-Wl,--exclude-libs=libc++_static.a',
     '-Wl,--warn-shared-textrel',
     '--rtlib=compiler-rt',
-    '-Lproject_stub/third_party/mesa3d/subprojects/llvm',
+    '-Lproject_stub/tools/compiler/install/lib',
     '-lLLVMMCDisassembler',
     '-lLLVMSelectionDAG',
     '-lLLVMExtensions',
@@ -164,8 +164,8 @@ c = ['ccache', 'project_stub/prebuilts/clang/ohos/linux-x86_64/llvm/bin/clang']
 cpp = ['ccache', 'project_stub/prebuilts/clang/ohos/linux-x86_64/llvm/bin/clang++']
 c_ld= 'lld'
 cpp_ld = 'lld'
-strip = 'project_stub/tools/llvm-project-llvmorg-18.1.8/build/bin/llvm-strip'
-llvm-config = 'project_stub/tools/llvm-project-llvmorg-18.1.8/build/bin/llvm-config'
+strip = 'project_stub/tools/compiler/install/bin/llvm-strip'
+llvm-config = 'project_stub/tools/compiler/install/bin/llvm-config'
 pkgconfig = '/usr/bin/pkg-config'
 
 [host_machine]
@@ -192,6 +192,7 @@ def generate_pc_file(file_raw, project_dir, product_name):
             raw_content = file_raw.read()
             raw_content = raw_content.replace("ohos_project_directory_stub", project_dir)
             raw_content = raw_content.replace("ohos-arm-release", product_name)
+             raw_content = raw_content.replace("ohos-arm", "ohos-x86_64")
             pc_file.write(raw_content)
     print("generate_pc_file")
 

ohos/pkgconfig_template/LLVMSPIRVLib.pc

@@ -0,0 +1,12 @@
+prefix=/home/geekyharmony/ohsc/OpenHarmony-5.1.0-Release/tools/compiler/install
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: LLVMSPIRVLib
+Description: LLVM/SPIR-V bi-directional translator
+Version: 15.0.0.0
+URL: https://github.com/KhronosGroup/SPIRV-LLVM-Translator
+
+Libs: -L${libdir} -lLLVMSPIRVLib
+Cflags: -I${includedir}

ohos/pkgconfig_template/SPIRV-Tools-shared.pc

@@ -0,0 +1,12 @@
+prefix=/home/geekyharmony/ohsc/OpenHarmony-5.1.0-Release/tools/compiler/install
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: SPIRV-Tools
+Description: Tools for SPIR-V
+Version: 2024.4.1
+URL: https://github.com/KhronosGroup/SPIRV-Tools
+
+Libs: -L${libdir} -lSPIRV-Tools-shared
+Cflags: -I${includedir}

ohos/pkgconfig_template/SPIRV-Tools.pc

@@ -0,0 +1,12 @@
+prefix=/home/geekyharmony/ohsc/OpenHarmony-5.1.0-Release/tools/compiler/install
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: SPIRV-Tools
+Description: Tools for SPIR-V
+Version: 2024.4.1
+URL: https://github.com/KhronosGroup/SPIRV-Tools
+
+Libs: -L${libdir} -lSPIRV-Tools-opt -lSPIRV-Tools -lSPIRV-Tools-link
+Cflags: -I${includedir}

ohos/pkgconfig_template/libclc.pc

@@ -0,0 +1,8 @@
+includedir=/home/geekyharmony/ohsc/OpenHarmony-5.1.0-Release/tools/compiler/install/include
+libexecdir=/home/geekyharmony/ohsc/OpenHarmony-5.1.0-Release/tools/compiler/install/share/clc
+
+Name: libclc
+Description: Library requirements of the OpenCL C programming language
+Version: 0.2.0
+Cflags: -I${includedir}
+Libs: -L${libexecdir}

ohos/pkgconfig_template/libsurface.pc

@@ -1,6 +1,6 @@
 ohos_project_dir=ohos_project_directory_stub
 libdir=${ohos_project_dir}/out/ohos-arm-release/graphic/graphic_surface/
-includedir=${ohos_project_dir}/out/ohos-arm-release/innerkits/ohos-x86_64/graphic_surface/surface/include/
+includedir=${ohos_project_dir}/out/ohos-arm-release/innerkits/ohos-arm/graphic_surface/surface/include/
 
 Name: libsurface
 Version: 2.4.1