diff options
author | Benjamin Barenblat <bbaren@google.com> | 2024-09-03 14:40:23 -0400 |
---|---|---|
committer | Benjamin Barenblat <bbaren@google.com> | 2024-09-03 14:40:23 -0400 |
commit | 130925baf43d1d33d2b412ee6616c969bdbcf99a (patch) | |
tree | b8852a445d3a66cc5e479e999d76c27740c59fb0 /debian/patches/pkg-config-directives.diff | |
parent | edd50222f6dc84d6d76acdd3e1ad23ad1bc3bec6 (diff) |
Update patches and bump internal namespace
Diffstat (limited to 'debian/patches/pkg-config-directives.diff')
-rw-r--r-- | debian/patches/pkg-config-directives.diff | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/debian/patches/pkg-config-directives.diff b/debian/patches/pkg-config-directives.diff index 726d6aec..ad3782d2 100644 --- a/debian/patches/pkg-config-directives.diff +++ b/debian/patches/pkg-config-directives.diff @@ -7,15 +7,13 @@ disable warnings. --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake -@@ -187,10 +187,7 @@ - endif() - endforeach() - foreach(cflag ${ABSL_CC_LIB_COPTS}) -- if(${cflag} MATCHES "^(-Wno|/wd)") +@@ -195,9 +195,6 @@ + # specified platform. Filter both of them out before the successor + # reaches the "^-m" filter. + set(skip_next_cflag ON) +- elseif(${cflag} MATCHES "^(-Wno|/wd)") - # These flags are needed to suppress warnings that might fire in our headers. - set(PC_CFLAGS "${PC_CFLAGS} ${cflag}") -- elseif(${cflag} MATCHES "^(-W|/w[1234eo])") -+ if(${cflag} MATCHES "^(-W|/w[1234eo])") + 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 |