romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 04:03:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

build: strip empty properties from libcurl.pc

Browse source 
To keep it tidy and to support properties in the template that only
appear in the generated `libcurl.pc` when filled.

E.g. `Required.private` may remain empty after #22548.

Also:
- GHA/windows: dump `libcurl.pc` to log in every job
- tidy up a pre-existing regex in the updated command.
  2c22d3069a #22544

Ref: b9254da617 #22548
Cherry-picked from #22543

Closes #22553
This commit is contained in:
Viktor Szakats 2026-08-12 10:52:42 +02:00
parent acd9411b01
commit 852f5d34da
No known key found for this signature in database
3 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
.github/workflows/windows.yml vendored
View file

@ -156,6 +156,12 @@ jobs:
echo '::group::raw'; cat bld/lib/curl_config.h || true; echo '::endgroup::'
grep -F '#define' bld/lib/curl_config.h | sort || true
- name: 'libcurl.pc, curl-config'
run: |
for f in libcurl.pc curl-config; do
echo "::group::${f}"; grep -v '^#' bld/"${f}" || true; echo '::endgroup::'
done
- name: 'build'
timeout-minutes: 10
run: |
@ -419,6 +425,12 @@ jobs:
grep -F '#define' bld/lib/curl_config.h | sort || true
cat bld/cmake_install.cmake || true
- name: 'libcurl.pc, curl-config, cmake_install.cmake'
run: |
for f in libcurl.pc curl-config cmake_install.cmake; do
echo "::group::${f}"; grep -v '^#' bld/"${f}" || true; echo '::endgroup::'
done
- name: 'build'
timeout-minutes: 10
run: |
@ -703,6 +715,12 @@ jobs:
echo '::group::raw'; cat bld/lib/curl_config.h || true; echo '::endgroup::'
grep -F '#define' bld/lib/curl_config.h | sort || true
- name: 'libcurl.pc, curl-config'
run: |
for f in libcurl.pc curl-config; do
echo "::group::${f}"; grep -v '^#' bld/"${f}" || true; echo '::endgroup::'
done
- name: 'build'
timeout-minutes: 5
run: |
@ -844,6 +862,12 @@ jobs:
echo '::group::raw'; cat bld/lib/curl_config.h || true; echo '::endgroup::'
grep -F '#define' bld/lib/curl_config.h | sort || true
- name: 'libcurl.pc, curl-config'
run: |
for f in libcurl.pc curl-config; do
echo "::group::${f}"; grep -v '^#' bld/"${f}" || true; echo '::endgroup::'
done
- name: 'build'
run: |
if [ "${MATRIX_BUILD}" = 'cmake' ]; then
@ -1108,6 +1132,12 @@ jobs:
timeout-minutes: 5
run: cmake --build bld --config "${MATRIX_TYPE}" --parallel 5
- name: 'libcurl.pc, curl-config'
run: |
for f in libcurl.pc curl-config; do
echo "::group::${f}"; grep -v '^#' bld/"${f}" || true; echo '::endgroup::'
done
- name: 'curl -V'
timeout-minutes: 1
run: |

3
CMakeLists.txt
View file

@ -2363,10 +2363,11 @@ if(NOT CURL_DISABLE_INSTALL)
configure_file(
"${PROJECT_SOURCE_DIR}/libcurl.pc.in"
"${PROJECT_BINARY_DIR}/libcurl.pc" @ONLY)
# Strip trailing spaces, and duplicate spaces after colon
# Strip trailing spaces, duplicate spaces after colon, empty properties
file(READ "${PROJECT_BINARY_DIR}/libcurl.pc" _libcurl_pc)
string(REGEX REPLACE " +\n" "\n" _libcurl_pc "${_libcurl_pc}")
string(REGEX REPLACE "\nLibs\.private: +" "\nLibs.private: " _libcurl_pc "${_libcurl_pc}")
string(REGEX REPLACE "\n([A-Za-z.]+:\n)+" "\n" _libcurl_pc "${_libcurl_pc}")
file(WRITE "${PROJECT_BINARY_DIR}/libcurl.pc" "${_libcurl_pc}")
install(FILES "${PROJECT_BINARY_DIR}/libcurl.pc"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")

4
configure.ac
View file

@ -5560,8 +5560,8 @@ AC_CONFIG_FILES([\
])
AC_CONFIG_FILES([curl-config], [chmod +x curl-config])
AC_CONFIG_FILES([libcurl.pc], [
dnl strip trailing spaces, and duplicate spaces after colon
"$SED" -e 's/ *$//g' -e 's/^Libs\.private: */Libs.private: /g' libcurl.pc > libcurl.pc.tmp && mv libcurl.pc.tmp libcurl.pc
dnl strip trailing spaces, duplicate spaces after colon, empty properties
"$SED" -e 's/ *$//g' -e 's/^Libs\.private: */Libs.private: /' -e '/^@<:@A-Za-z.@:>@*:$/d' libcurl.pc > libcurl.pc.tmp && mv libcurl.pc.tmp libcurl.pc
], [SED="$SED"])
AC_OUTPUT