852f5d34da — curl

Subject

build: strip empty properties from `libcurl.pc`

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

.github/workflows/windows.yml +30 -0 CMakeLists.txt +2 -1 configure.ac +2 -2

.github/workflows/windows.yml+30 -0

@@ -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: \|

CMakeLists.txt+2 -1

@@ -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")

configure.ac+2 -2

@@ -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