cmake: lib `CURL_STATICLIB` fixes (Windows) #11914

vszakats · 2023-09-22T10:56:12Z

always define CURL_STATICLIB when building libcurl for Windows.

This disables __declspec(dllexport) for exported libcurl symbols.
In normal mode (hide symbols) these exported symbols are specified
via libcurl.def. When not hiding symbols, all symbols are exported
by default.

Regression from 1199308

Fixes When building a static library project for Visual Studio with CMake, the preprocessor variable CURL_STATICLIB does not get set #11844
fix to omit libcurl.def when not hiding private symbols.

Regression from 2ebc74c
fix ENABLED_DEBUG=ON + shared curl tool Windows builds by also
omitting libcurl.def in this case, and exporting all symbols
instead. This ensures that a shared curl tool can access all debug
functions which are not normally exported from libcurl DLL.
delete INTERFACE_COMPILE_DEFINITIONS "CURL_STATICLIB" for "objects"
target.

Follow-up to 2ebc74c
delete duplicate BUILDING_LIBCURL definitions.
fix HIDES_CURL_PRIVATE_SYMBOLS to not overwrite earlier build settings.

Follow-up to 1199308

Closes #11914

vszakats · 2023-09-22T17:58:12Z

A new issue came up: memdebug.c functions cannot be accessed in ENABLED_DEBUG=ON + shared curl.exe builds. Because these functions are missing from libcurl.def and after this PR CURL_STATICLIB leaves them unexported.

https://ci.appveyor.com/project/curlorg/curl/build/job/8olkqly0nb6yb2v9 (CMake, VS2008, Release x86, Schannel)
https://ci.appveyor.com/project/curlorg/curl/build/job/x61dq69gdtsq7fvx (CMake, VS2022, Release x64, OpenSSL, WebSockets, Unity)

Plus there is curl_easy_perform_ev() going on a different track than memdebug functions, and ending up missing too.

vszakats · 2023-09-22T22:25:13Z

Solved the ENABLED_DEBUG=ON + shared tool case by introducing libcurl-debug.def.

This relies on CMake merging the two .def files before passing to the linker. Linkers may not natively support multiple .def files (couldn't yet figure out if this needs a specific CMake version), e.g. lld honors only the last one passed. It means the Makefile.mk use needs further fixing.

UPDATE: Seems to require CMake 3.12.0, so this solution is doubly no good.

vszakats · 2023-09-23T02:05:35Z

Solved this one by extending libcurl-debug.def to include all standard libcurl API definitions as well. Plus a test for it. This fixes debug + shared tool builds with both older CMake and Makefile.mk builds.

This perhaps isn't the most elegant solution, but I cannot think of a better one. Other alternatives may be to:

Split off debug functions to a separate lib and link that statically always (this would be likely more complex.)
Find a CMake feature that is able to set list of exports with a regex (curl_*) for all supported compilers (like autotools does).
Either:
- drop Windows support from Makefile.mk.
- find an lld/ld option to limit exports to a regex (like libtool's "-export-symbols-regex '^curl_.*'") [There don't seem to be such option.]
- dynamically generate .def via our existing Perl script (making Perl a hard requirement there) [This worked fine locally as an experiment].
Export all symbols for debug builds.

vszakats · 2023-09-23T02:40:25Z

Next issues:

non-Windows symbol curl_dbg_socketpair is picked up by tests/extern-scan.pl.
tests/extern-scan.pl misses to pick up curl_dbg_malloc, curl_dbg_calloc, curl_dbg_realloc.

UPDATE: fixed.

vszakats · 2023-09-23T09:44:06Z

Tending to prefer the option 'Export all symbols for debug builds' as a reasonable compromise. This makes it unnecessary to roll a libcurl-debug.def.

…d settings Regression from 1199308

…bjects" target Follow-up to 2ebc74c

Regression from 2ebc74c

vszakats · 2023-09-23T09:58:24Z

Strange error from a single CI job for the test added in this PR:

=== Start of file stderr3203
 Unsuccessful open on filename containing newline at ../../tests/extern-scan.pl line 88.
 readline() on closed filehandle H at ../../tests/extern-scan.pl line 90.
 Unsuccessful open on filename containing newline at ../../tests/extern-scan.pl line 88.
 readline() on closed filehandle H at ../../tests/extern-scan.pl line 90.
=== End of file stderr3203

Ref: https://github.com/curl/curl/actions/runs/6281395226/job/17062947662?pr=11914#step:11:3161

This disables `__declspec(dllexport)` for exported libcurl symbols. In normal mode (hide symbols) these exported symbols are specified via `libcurl.def`. When not hiding symbols, all symbols are exported by default. Regression from 1199308 Fixes curl#11844

lib/CMakeLists.txt

We already used `WINDOWS_EXPORT_ALL_SYMBOLS` in `CMake/CurlSymbolHiding.cmake` for MSVC, but that was limited to cases when hiding symbols explicitly. We need to do this also when disabling symbol hiding automtically for debug builds.

Also fix to export all symbols in Windows debug builds, making `-debug-dyn` builds work with `-DCURL_STATICLIB` set. Ref: #11914 (same for CMake) Closes #11924

Symbol hiding options are enabled by default and with clang/gcc toolchains it adds the `-fvisibility=hidden` linker option. We need to disable it to make debug builds export all symbols from libcurl DLL with these compilers. This case misses CI coverage. (mingw-w64, debug with shared lib only (or static+shared and BUILD_STATIC_CURL=OFF) while linking libcurl DLL statically with dependencies exporting their symbols.)

This ensures that any symbol-hiding compiler option is used everywhere and it also makes it unnecessary to repeat the MSVC-specific option `WINDOWS_EXPORT_ALL_SYMBOLS=ON`.

Also fix to export all symbols in Windows debug builds, making `-debug-dyn` builds work with `-DCURL_STATICLIB` set. Ref: curl#11914 (same for CMake) Closes curl#11924

vszakats added the cmake label Sep 22, 2023

github-actions bot added the build label Sep 22, 2023

vszakats added the Windows Windows-specific label Sep 22, 2023

vszakats force-pushed the cmake-lib-fixups branch from 47486c0 to 7930b65 Compare September 22, 2023 12:04

vszakats force-pushed the cmake-lib-fixups branch from a383659 to d182de9 Compare September 22, 2023 18:56

github-actions bot added the CI Continuous Integration label Sep 22, 2023

vszakats force-pushed the cmake-lib-fixups branch 3 times, most recently from c0a1076 to 91a8ced Compare September 23, 2023 01:50

github-actions bot added the tests label Sep 23, 2023

vszakats force-pushed the cmake-lib-fixups branch from 91a8ced to 0cdc24e Compare September 23, 2023 01:52

vszakats added 4 commits September 23, 2023 09:56

cmake: fix HIDES_CURL_PRIVATE_SYMBOLS to not overwrite earlier buil…

e421139

…d settings Regression from 1199308

cmake: delete duplicate BUILDING_LIBCURL definitions

304a876

cmake: delete INTERFACE_COMPILE_DEFINITIONS "CURL_STATICLIB" for "o…

58fed8d

…bjects" target Follow-up to 2ebc74c

cmake: only use libcurl.def when hiding symbols (default)

088d4c7

Regression from 2ebc74c

vszakats force-pushed the cmake-lib-fixups branch from 124f2a4 to 33dab5f Compare September 23, 2023 11:06

vszakats force-pushed the cmake-lib-fixups branch from 33dab5f to aaba2c8 Compare September 23, 2023 16:47

vszakats removed tests CI Continuous Integration build labels Sep 23, 2023

vszakats mentioned this pull request Sep 23, 2023

Makefile.mk: always set CURL_STATICLIB for lib (Windows) #11924

Closed

vszakats changed the title ~~cmake: libcurl build fixups~~ cmake: libcurl CURL_STATICLIB fixes Sep 23, 2023

vszakats changed the title ~~cmake: libcurl CURL_STATICLIB fixes~~ cmake: libcurl CURL_STATICLIB fixes (Windows) Sep 23, 2023

vszakats changed the title ~~cmake: libcurl CURL_STATICLIB fixes (Windows)~~ cmake: lib CURL_STATICLIB fixes (Windows) Sep 23, 2023

vszakats force-pushed the cmake-lib-fixups branch from aaba2c8 to 363e76d Compare September 23, 2023 17:29

github-actions bot added the build label Sep 23, 2023

jay reviewed Sep 23, 2023

View reviewed changes

lib/CMakeLists.txt Outdated Show resolved Hide resolved

cmake: fix to export all symbols in debug builds

0b0bb76

We already used `WINDOWS_EXPORT_ALL_SYMBOLS` in `CMake/CurlSymbolHiding.cmake` for MSVC, but that was limited to cases when hiding symbols explicitly. We need to do this also when disabling symbol hiding automtically for debug builds.

vszakats added the regression label Sep 23, 2023

vszakats force-pushed the cmake-lib-fixups branch from 363e76d to 0b0bb76 Compare September 23, 2023 21:22

github-actions bot added the CI Continuous Integration label Sep 24, 2023

vszakats force-pushed the cmake-lib-fixups branch 2 times, most recently from 84d1072 to 75655f1 Compare September 24, 2023 00:53

github-actions bot added the cmdline tool label Sep 24, 2023

vszakats added 2 commits September 24, 2023 08:46

cmake: disable symbol hiding for debug builds the earliest

399d17b

This ensures that any symbol-hiding compiler option is used everywhere and it also makes it unnecessary to repeat the MSVC-specific option `WINDOWS_EXPORT_ALL_SYMBOLS=ON`.

vszakats force-pushed the cmake-lib-fixups branch 4 times, most recently from c81157e to 399d17b Compare September 24, 2023 17:10

vszakats removed cmdline tool CI Continuous Integration labels Sep 24, 2023

vszakats closed this in a8ebde9 Sep 25, 2023

vszakats deleted the cmake-lib-fixups branch September 25, 2023 22:11

dietssa mentioned this pull request Oct 13, 2023

libcurl: add version 8.4.0 (fix CVE-2023-38545) conan-io/conan-center-index#19769

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cmake: lib `CURL_STATICLIB` fixes (Windows) #11914

cmake: lib `CURL_STATICLIB` fixes (Windows) #11914

vszakats commented Sep 22, 2023 •

edited

Loading

vszakats commented Sep 22, 2023 •

edited

Loading

vszakats commented Sep 22, 2023 •

edited

Loading

vszakats commented Sep 23, 2023 •

edited

Loading

vszakats commented Sep 23, 2023 •

edited

Loading

vszakats commented Sep 23, 2023 •

edited

Loading

vszakats commented Sep 23, 2023 •

edited

Loading

cmake: lib CURL_STATICLIB fixes (Windows) #11914

cmake: lib CURL_STATICLIB fixes (Windows) #11914

Conversation

vszakats commented Sep 22, 2023 • edited Loading

vszakats commented Sep 22, 2023 • edited Loading

vszakats commented Sep 22, 2023 • edited Loading

vszakats commented Sep 23, 2023 • edited Loading

vszakats commented Sep 23, 2023 • edited Loading

vszakats commented Sep 23, 2023 • edited Loading

vszakats commented Sep 23, 2023 • edited Loading

cmake: lib `CURL_STATICLIB` fixes (Windows) #11914

cmake: lib `CURL_STATICLIB` fixes (Windows) #11914

vszakats commented Sep 22, 2023 •

edited

Loading

vszakats commented Sep 22, 2023 •

edited

Loading

vszakats commented Sep 22, 2023 •

edited

Loading

vszakats commented Sep 23, 2023 •

edited

Loading

vszakats commented Sep 23, 2023 •

edited

Loading

vszakats commented Sep 23, 2023 •

edited

Loading

vszakats commented Sep 23, 2023 •

edited

Loading