summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-07-31 18:16:21 +0200
committerLars Wendler <polynomial-c@gentoo.org>2019-07-31 18:18:10 +0200
commitb6f4e5bd8aeeea00704ffd77554d8c3d7291f1d4 (patch)
tree386eec3535609d5df5c43c8f69e4a293eff637ee /sys-apps/kbd/files
parentwww-apps/icingaweb2: 2.7.0 bump (diff)
downloadgentoo-b6f4e5bd8aeeea00704ffd77554d8c3d7291f1d4.tar.gz
gentoo-b6f4e5bd8aeeea00704ffd77554d8c3d7291f1d4.tar.bz2
gentoo-b6f4e5bd8aeeea00704ffd77554d8c3d7291f1d4.zip
sys-apps/kbd: Respect user CFLAGS
Thanks-to: Michał Górny <mgorny@gentoo.org> Bug: https://bugs.gentoo.org/691142 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-apps/kbd/files')
-rw-r--r--sys-apps/kbd/files/kbd-2.2.0-cflags.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/sys-apps/kbd/files/kbd-2.2.0-cflags.patch b/sys-apps/kbd/files/kbd-2.2.0-cflags.patch
new file mode 100644
index 000000000000..86c0f45074ac
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-2.2.0-cflags.patch
@@ -0,0 +1,33 @@
+From 3b4f3ffbc9fedff83a0618f3dd3c6aafced3e72a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 31 Jul 2019 18:07:33 +0200
+Subject: [PATCH] configure.ac: respect user CFLAGS
+
+Do not override user CFLAGS. Do not unconditionally add -g to CFLAGS.
+
+Gentoo-bug: https://bugs.gentoo.org/691142
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6bf6401..0f5ed2f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,9 +72,9 @@ if test "$enable_code_coverage" = yes; then
+ fi
+
+ case "$GCC,$ac_cv_prog_cc_g" in
+- yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE" ;;
+- yes,) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE" ;;
+- ,yes) CFLAGS="-g" ;;
++ yes,yes) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;;
++ yes,) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;;
++ ,yes) CFLAGS="$CFLAGS" ;;
+ esac
+
+ CC_CHECK_CFLAGS_APPEND([\
+--
+2.22.0
+