summaryrefslogtreecommitdiff
path: root/net-print/cups/files/cups-2.4.2-no-fortify-override.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net-print/cups/files/cups-2.4.2-no-fortify-override.patch')
-rw-r--r--net-print/cups/files/cups-2.4.2-no-fortify-override.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/net-print/cups/files/cups-2.4.2-no-fortify-override.patch b/net-print/cups/files/cups-2.4.2-no-fortify-override.patch
new file mode 100644
index 000000000000..e9153ce2f082
--- /dev/null
+++ b/net-print/cups/files/cups-2.4.2-no-fortify-override.patch
@@ -0,0 +1,18 @@
+Gentoo already sets -D_FORTIFY_SOURCE=2 by default in GCC (patched in), so
+we need to avoid doing this in packages to avoid redefinition errors if
+we try to upgrade to e.g. =3.
+
+So, no effect on users, but important to stop issues w/ F_S=3.
+--- a/config-scripts/cups-compiler.m4
++++ b/config-scripts/cups-compiler.m4
+@@ -106,8 +106,8 @@ AS_IF([test -n "$GCC"], [
+ ], [
+ # Otherwise use the Fortify enhancements to catch any unbounded
+ # string operations...
+- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+- CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
++ CFLAGS="$CFLAGS"
++ CXXFLAGS="$CXXFLAGS"
+ ])
+
+ # Default optimization options...