Skip to content

Commit

Permalink
update to riscv-kernel-6.11.0 v15
Browse files Browse the repository at this point in the history
  • Loading branch information
ZLangJIT committed Oct 5, 2024
1 parent c0e96be commit 2c1fdba
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions libmedia.patch
Original file line number Diff line number Diff line change
Expand Up @@ -125543,10 +125543,10 @@ index 00000000..ab21814b
+#endif
diff --git a/app/src/main/java/libengine/build_root.cmake b/app/src/main/java/libengine/build_root.cmake
new file mode 100644
index 00000000..42bb6909
index 00000000..c5b83982
--- /dev/null
+++ b/app/src/main/java/libengine/build_root.cmake
@@ -0,0 +1,813 @@
@@ -0,0 +1,815 @@
+macro(build_root_message str)
+ if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/build_root_log.txt)
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/build_root_log.txt "BUILD_ROOT LOG : ${str}\n")
Expand Down Expand Up @@ -125879,19 +125879,16 @@ index 00000000..42bb6909
+ if(CMAKE_ANDROID_ARCH_ABI MATCHES x86_64)
+ set(BUILD_ROOT_____________android_machine x86_64)
+ set(BUILD_ROOT_____________android_machine_family x86)
+ set(BUILD_ROOT_____________cross_host "--host=x86_64-linux-android")
+ set(BUILD_ROOT_____________android_compiler_prefix x86_64)
+ set(BUILD_ROOT_____________NBBY 8)
+ elseif(CMAKE_ANDROID_ARCH_ABI MATCHES x86)
+ set(BUILD_ROOT_____________android_machine i686)
+ set(BUILD_ROOT_____________android_machine_family x86)
+ set(BUILD_ROOT_____________cross_host "--host=i686-linux-android")
+ set(BUILD_ROOT_____________android_compiler_prefix i686)
+ set(BUILD_ROOT_____________NBBY 4)
+ elseif(CMAKE_ANDROID_ARCH_ABI MATCHES armeabi-v7a)
+ set(BUILD_ROOT_____________android_machine armv7)
+ set(BUILD_ROOT_____________android_machine_family armeabi)
+ set(BUILD_ROOT_____________cross_host "--host=armv7a-linux-androideabi")
+ set(BUILD_ROOT_____________android_compiler_prefix armv7a)
+ set(BUILD_ROOT_____________NBBY 4)
+ elseif(CMAKE_ANDROID_ARCH_ABI MATCHES arm64-v8a)
Expand All @@ -125902,7 +125899,7 @@ index 00000000..42bb6909
+ else()
+ build_root_fatal("unknown android arch: ${CMAKE_ANDROID_ARCH_ABI}")
+ endif()
+ set(BUILD_ROOT_____________cross_host "--host=${BUILD_ROOT_____________android_compiler_prefix}-${BUILD_ROOT_____________android_compiler_suffix}")
+ set(BUILD_ROOT_____________cross_host "${BUILD_ROOT_____________android_compiler_prefix}-${BUILD_ROOT_____________android_compiler_suffix}")
+ set(BUILD_ROOT_____________deps_cc "${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/${BUILD_ROOT_____________cross_host}-clang")
+ set(BUILD_ROOT_____________deps_cxx "${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/${BUILD_ROOT_____________cross_host}-clang++")
+ set(BUILD_ROOT_____________deps_ld "${CMAKE_ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld")
Expand All @@ -125917,7 +125914,7 @@ index 00000000..42bb6909
+ else()
+ set(BUILD_ROOT_____________NBBY 8)
+ if (CMAKE_CROSSCOMPILING)
+ set(BUILD_ROOT_____________cross_host "--host=${ARCH_TRIPLET}")
+ set(BUILD_ROOT_____________cross_host "${ARCH_TRIPLET}")
+ else()
+ set(BUILD_ROOT_____________cross_host "")
+ endif()
Expand Down Expand Up @@ -126240,8 +126237,13 @@ index 00000000..42bb6909
+ ${BUILD_ROOT_____________BASH_PROGRAM} -c "${BUILD_ROOT_____________FLAGS} sh ./configure --help"
+ )
+ build_root_message("-------- BUILDING MAKEFILE PROJECT: '${build_dir}' -- CONFIGURING")
+ if (BUILD_ROOT_____________cross_host)
+ set(BUILD_ROOT_____________HOST_OPT "--host=${BUILD_ROOT_____________cross_host}")
+ else()
+ set(BUILD_ROOT_____________HOST_OPT "")
+ endif()
+ build_root_exec_working_directory("${BUILD_ROOT_____________HAS_DIR}"
+ ${BUILD_ROOT_____________BASH_PROGRAM} -c "${BUILD_ROOT_____________FLAGS} sh ./configure ${BUILD_ROOT_____________cross_host} ${BUILD_ROOT_____________cross_rc} --prefix=${LLVM_BUILD_ROOT__ROOTFS} ${new_line_seperated_extra_makefile_config_list_str}"
+ ${BUILD_ROOT_____________BASH_PROGRAM} -c "${BUILD_ROOT_____________FLAGS} sh ./configure ${BUILD_ROOT_____________HOST_OPT} ${BUILD_ROOT_____________cross_rc} --prefix=${LLVM_BUILD_ROOT__ROOTFS} ${new_line_seperated_extra_makefile_config_list_str}"
+ )
+ if (NOT EXISTS "${BUILD_ROOT_____________HAS_DIR}/Makefile")
+ build_root_fatal("'configure' failed to generate a 'Makefile' file inside the directory '${BUILD_ROOT_____________HAS_DIR}'")
Expand Down

0 comments on commit 2c1fdba

Please sign in to comment.