From 515bd24825db59baf921b618577f5ea40b437a1e Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 20 May 2024 13:19:17 +0200 Subject: [PATCH] curl.sh: add future update pending a curl PR [ci skip] Ref: https://github.com/curl/curl/pull/13592 --- curl.sh | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/curl.sh b/curl.sh index 87d0d8237..d110c9d76 100755 --- a/curl.sh +++ b/curl.sh @@ -85,16 +85,20 @@ _VER="$1" if [[ "${_CONFIG}" = *'debug'* ]]; then options+=' -DENABLE_DEBUG=ON' - # curl would only set this automatically for the 'Debug' configuration - # Required for certain BUILD_TESTING=ON 'testdeps' build targets to link - # correctly. - # Officially we should use `-DCMAKE_BUILD_TYPE=Debug` which also enables - # debug info, but it has the side-effect of adding a `-d` suffix to the - # DLL and static lib names (`libcurl-d-x64.dll`, `libcurl-d.a`, - # `libcurl-d.dll.a` on Windows) which breaks packaging logic. We also - # strip debug info when making libs reproducible anyway. - # The `-d` suffix may be deleted/customized via `CMAKE_DEBUG_POSTFIX`. - CPPFLAGS+=' -DDEBUGBUILD' + # Pending https://github.com/curl/curl/pull/13592 + if [ "${CURL_VER_}" != '8.7.1' ] && \ + [ "${CURL_VER_}" != '8.8.0' ]; then + # curl would only set this automatically for the 'Debug' configuration + # Required for certain BUILD_TESTING=ON 'testdeps' build targets to link + # correctly. + # Officially we should use `-DCMAKE_BUILD_TYPE=Debug` which also enables + # debug info, but it has the side-effect of adding a `-d` suffix to the + # DLL and static lib names (`libcurl-d-x64.dll`, `libcurl-d.a`, + # `libcurl-d.dll.a` on Windows) which breaks packaging logic. We also + # strip debug info when making libs reproducible anyway. + # The `-d` suffix may be deleted/customized via `CMAKE_DEBUG_POSTFIX`. + CPPFLAGS+=' -DDEBUGBUILD' + fi fi if [[ "${_CONFIG}" = *'curltests'* ]]; then