diff options
Diffstat (limited to 'debian/patches/pkg-config-libs-generation.diff')
| -rw-r--r-- | debian/patches/pkg-config-libs-generation.diff | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/debian/patches/pkg-config-libs-generation.diff b/debian/patches/pkg-config-libs-generation.diff deleted file mode 100644 index 5f217765..00000000 --- a/debian/patches/pkg-config-libs-generation.diff +++ /dev/null @@ -1,36 +0,0 @@ -From: Benjamin Barenblat <bbaren@google.com> -Subject: Check printf format strings in str_format_convert_test -Forwarded: yes -Applied-Upstream: https://github.com/abseil/abseil-cpp/commit/1963f10ae5cb32a7ea6d96b928f69d3c7fba0139 -Bug-Debian: https://bugs.debian.org/1011294 - -Don’t use generator expression to build .pc Libs lines - -When building pkg-config files, compute linker flags with a string -substitution rather than the JOIN generator expression. This ensures -that commas in linker flags don’t get treated as argument separators in -JOIN. - -The author works at Google. Upstream applied this patch as Piper -revision 450675966 and exported it to GitHub; the Applied-Upstream URL -above points to the exported commit. - ---- a/CMake/AbseilHelpers.cmake -+++ b/CMake/AbseilHelpers.cmake -@@ -167,6 +167,7 @@ - set(PC_CFLAGS "${PC_CFLAGS} ${cflag}") - endif() - endforeach() -+ string(REPLACE ";" " " PC_LINKOPTS "${ABSL_CC_LIB_LINKOPTS}") - FILE(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc" CONTENT "\ - prefix=${CMAKE_INSTALL_PREFIX}\n\ - exec_prefix=\${prefix}\n\ -@@ -178,7 +179,7 @@ - URL: https://abseil.io/\n\ - Version: ${PC_VERSION}\n\ - Requires:${PC_DEPS}\n\ --Libs: -L\${libdir} $<JOIN:${ABSL_CC_LIB_LINKOPTS}, > $<$<NOT:$<BOOL:${ABSL_CC_LIB_IS_INTERFACE}>>:-labsl_${_NAME}>\n\ -+Libs: -L\${libdir} ${PC_LINKOPTS} $<$<NOT:$<BOOL:${ABSL_CC_LIB_IS_INTERFACE}>>:-labsl_${_NAME}>\n\ - Cflags: -I\${includedir}${PC_CFLAGS}\n") - INSTALL(FILES "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc" - DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") |