diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-04-25 21:31:46 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-04-25 21:31:46 +0800 |
| commit | 0dd799f109760f00103a6c58b437aaf3148adc75 (patch) | |
| tree | 45a8f352c44fb5b53d4d37116c7dab2be75d5396 /indra/cmake | |
| parent | 5d928e32bff38595f2005f8065029a61054781d2 (diff) | |
| parent | f28dc513890043e7bc0968f1292f55ec7e8cd20a (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/CURL.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake index 8407aa1f1d..7f50975ea8 100644 --- a/indra/cmake/CURL.cmake +++ b/indra/cmake/CURL.cmake @@ -38,6 +38,12 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA INPUT ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1.tar.gz DESTINATION ${CMAKE_BINARY_DIR} ) + if (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64 AND (${LINUX_DISTRO} MATCHES fedora)) + execute_process( + COMMAND sed -i netrc.c -e "s/defined(HAVE_GETPWUID_R)/0/g" netrc.c + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/lib + ) + endif () file( COPY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/include/curl/curl.h @@ -76,6 +82,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl RESULT_VARIABLE curl_installed ) + unset(ENV{CFLAGS}) file( COPY ${CMAKE_BINARY_DIR}/3p-curl-7.54.1-r1/curl/lib/.libs/libcurl.a DESTINATION ${LIBS_PREBUILT_DIR}/lib/release |