mirror of
https://github.com/termux-pacman/termux-packages.git
synced 2026-02-22 01:12:41 +00:00
f5ecd4e4a5
- Disable `-mrelax-all` for 32-bit ARM, preventing `error: out of range pc-relative fixup value`; done by upstream for 64-bit RISCV here: 192294e15e
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
CMakeLists.txt patch is similar to https://github.com/libjxl/libjxl/commit/192294e15e1d27660d887bc3b9b5ead8e5aa6a93
|
|
Prevents: error: out of range pc-relative fixup value
|
|
|
|
--- a/tools/CMakeLists.txt
|
|
+++ b/tools/CMakeLists.txt
|
|
@@ -250,7 +250,7 @@
|
|
ssimulacra2.cc
|
|
../third_party/dirent.cc
|
|
)
|
|
- target_link_libraries(benchmark_xl Threads::Threads)
|
|
+ target_link_libraries(benchmark_xl Threads::Threads -landroid-glob -landroid-spawn)
|
|
target_link_libraries(benchmark_xl jxl_gauss_blur) # for ssimulacra
|
|
if(MINGW)
|
|
# MINGW doesn't support glob.h.
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -335,7 +335,7 @@ else ()
|
|
|
|
# Machine flags.
|
|
add_compile_options(-funwind-tables)
|
|
- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|
+ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
|
|
add_compile_options("SHELL:-Xclang -mrelax-all")
|
|
endif()
|
|
if (CXX_CONSTRUCTOR_ALIASES_SUPPORTED)
|
|
--- a/third_party/sjpeg/CMakeLists.txt
|
|
+++ b/third_party/sjpeg/CMakeLists.txt
|
|
@@ -44,20 +44,7 @@
|
|
################################################################################
|
|
# Android only.
|
|
|
|
-if(ANDROID)
|
|
- include_directories(${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures)
|
|
- add_library(cpufeatures-sjpeg
|
|
- STATIC ${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures/cpu-features.c
|
|
- )
|
|
- target_link_libraries(cpufeatures-sjpeg dl)
|
|
- set(SJPEG_DEP_LIBRARIES ${SJPEG_DEP_LIBRARIES} cpufeatures-sjpeg)
|
|
- set(SJPEG_DEP_INCLUDE_DIRS ${SJPEG_DEP_INCLUDE_DIRS}
|
|
- ${SJPEG_ANDROID_NDK_PATH}/sources/android/cpufeatures
|
|
- )
|
|
-endif()
|
|
-
|
|
## Check for SIMD extensions.
|
|
-include(${CMAKE_CURRENT_LIST_DIR}/cmake/cpu.cmake)
|
|
|
|
################################################################################
|
|
# sjpeg source files.
|