diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2014-01-05 23:33:03 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-01-05 23:33:03 +0000 |
| commit | 3ec077cff12afce662d6f6856e940bd5739f746e (patch) | |
| tree | 6db08942d88099d60f9efc9e59f21582b4267169 /net-proxy/dante/files/dante-1.4.0-cflags.patch | |
| parent | EAPI bump (diff) | |
| download | gentoo-2-3ec077cff12afce662d6f6856e940bd5739f746e.tar.gz gentoo-2-3ec077cff12afce662d6f6856e940bd5739f746e.tar.bz2 gentoo-2-3ec077cff12afce662d6f6856e940bd5739f746e.zip | |
Version bump; also restores upnp and libdsocks support.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-proxy/dante/files/dante-1.4.0-cflags.patch')
| -rw-r--r-- | net-proxy/dante/files/dante-1.4.0-cflags.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/net-proxy/dante/files/dante-1.4.0-cflags.patch b/net-proxy/dante/files/dante-1.4.0-cflags.patch new file mode 100644 index 000000000000..eccb64a5d7d8 --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.0-cflags.patch @@ -0,0 +1,32 @@ +The upstream code tries to remove -g from CFLAGS, but the logic also matches +the -g in the middle of flags, like: +-frecord-gcc-switches => -frecordcc-switches +-ggdb3 => ggdb3 +Both of which cause GCC to fail horribly! + +Fix the grep & sed to only match standalone instances. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Nuar dante-1.4.0.orig/compiler.m4 dante-1.4.0/compiler.m4 +--- dante-1.4.0.orig/compiler.m4 2013-10-24 13:20:23.000000000 -0700 ++++ dante-1.4.0/compiler.m4 2014-01-05 15:18:03.544336373 -0800 +@@ -375,14 +375,14 @@ + gcc) + if test x"$aixldbug" != x; then + #disable debug info +- if echo $CFLAGS | grep -- "-g" >/dev/null; then +- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" ++ if echo $CFLAGS | grep -w -- "-g" >/dev/null; then ++ CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`" + fi + CFLAGS="$CFLAGS${CFLAGS:+ }-g0" + else + #use -ggdb also when not debugging +- if echo $CFLAGS | grep -- "-g" >/dev/null; then +- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" ++ if echo $CFLAGS | grep -w -- "-g" >/dev/null; then ++ CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`" + fi + CFLAGS="$CFLAGS${CFLAGS:+ }-ggdb" + fi |