From de1b4de8da1cb0127da16824c40d205a0d1c29aa Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Tue, 30 Aug 2022 22:40:57 -0400 Subject: Backport an upstream patch to fix pkg-config file generation See https://github.com/abseil/abseil-cpp/pull/1216 (upstream commit 09e96049995584c3489e4bd1467313e3e85af99c) for full details. --- debian/patches/leaky-pkgconfig-cflags.diff | 16 ++++++++++++++++ debian/patches/series | 1 + 2 files changed, 17 insertions(+) create mode 100644 debian/patches/leaky-pkgconfig-cflags.diff (limited to 'debian/patches') diff --git a/debian/patches/leaky-pkgconfig-cflags.diff b/debian/patches/leaky-pkgconfig-cflags.diff new file mode 100644 index 00000000..cf1479d4 --- /dev/null +++ b/debian/patches/leaky-pkgconfig-cflags.diff @@ -0,0 +1,16 @@ +From: Bruno Pitrus +Subject: Do not leak -maes -msse4.1 into pkgconfig +Forwarded: https://github.com/abseil/abseil-cpp/pull/1216 +Origin: upstream, https://github.com/abseil/abseil-cpp/commit/09e96049995584c3489e4bd1467313e3e85af99c + +--- a/CMake/AbseilHelpers.cmake ++++ b/CMake/AbseilHelpers.cmake +@@ -166,6 +166,8 @@ + set(PC_CFLAGS "${PC_CFLAGS} ${cflag}") + elseif(${cflag} MATCHES "^(-W|/w[1234eo])") + # Don't impose our warnings on others. ++ elseif(${cflag} MATCHES "^-m") ++ # Don't impose CPU instruction requirements on others, as the code performs feature detection on runtime. + else() + set(PC_CFLAGS "${PC_CFLAGS} ${cflag}") + endif() diff --git a/debian/patches/series b/debian/patches/series index b64772ac..c30e9953 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ configure.diff cpu-features.diff latomic.diff empty-flags-library.diff +leaky-pkgconfig-cflags.diff -- cgit v1.2.3