archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix GH-17855: CURL_STATICLIB flag set even if linked with shared lib

Browse source 
We must define `CURL_STATICLIB` only when building against a static
libcurl.  The detection relies on our usual naming conventions, what
should be revised in the future (possibly using pkg-config, or
switching to CMake).

Closes GH-17857.
This commit is contained in:
Christoph M. Becker 2025-02-18 19:43:33 +01:00
parent 260e0e9bd3
commit 29c39a3d91
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -57,6 +57,8 @@ PHP NEWS
- Windows: - Windows:
. Fixed phpize for Windows 11 (24H2). (bwoebi) . Fixed phpize for Windows 11 (24H2). (bwoebi)
. Fixed GH-17855 (CURL_STATICLIB flag set even if linked with shared lib).
(cmb)
- Zlib: - Zlib:
. Fixed bug GH-17745 (zlib extension incorrectly handles object arguments). . Fixed bug GH-17745 (zlib extension incorrectly handles object arguments).

8
ext/curl/config.w32
View file

@ -13,7 +13,8 @@ if (PHP_CURL != "no") {
} }
} }
if (CHECK_LIB("libcurl_a.lib;libcurl.lib", "curl", PHP_CURL) && var curl_location;
if ((curl_location = CHECK_LIB("libcurl_a.lib;libcurl.lib", "curl", PHP_CURL)) &&
CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") && CHECK_HEADER_ADD_INCLUDE("curl/easy.h", "CFLAGS_CURL") &&
SETUP_OPENSSL("curl", PHP_CURL) > 0 && SETUP_OPENSSL("curl", PHP_CURL) > 0 &&
CHECK_LIB("winmm.lib", "curl", PHP_CURL) && CHECK_LIB("winmm.lib", "curl", PHP_CURL) &&
@ -28,7 +29,10 @@ if (PHP_CURL != "no") {
) { ) {
EXTENSION("curl", "interface.c multi.c share.c curl_file.c"); EXTENSION("curl", "interface.c multi.c share.c curl_file.c");
AC_DEFINE('HAVE_CURL', 1, 'Have cURL library'); AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB /D PHP_CURL_EXPORTS=1"); ADD_FLAG("CFLAGS_CURL", "/D PHP_CURL_EXPORTS=1");
if (curl_location.match(/libcurl_a\.lib$/)) {
ADD_FLAG("CFLAGS_CURL", "/D CURL_STATICLIB");
}
PHP_INSTALL_HEADERS("ext/curl", "php_curl.h"); PHP_INSTALL_HEADERS("ext/curl", "php_curl.h");
// TODO: check for curl_version_info // TODO: check for curl_version_info
} else { } else {