[icestorm] 02/03: Remove some CXXFLAGS

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository icestorm.

commit e0d951656271a4f629945aa434d86aa8076a0db5
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Oct 8 08:37:40 2015 +0200

    Remove some CXXFLAGS
---
 debian/patches/03_cxxflags.patch | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/patches/03_cxxflags.patch b/debian/patches/03_cxxflags.patch
index 86e0c53..0c4810d 100644
--- a/debian/patches/03_cxxflags.patch
+++ b/debian/patches/03_cxxflags.patch
@@ -2,35 +2,41 @@ Description: This makes sure that the CXXFLAGS given by the
  Debian build system are not overwritten, but prepended.
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 
---- icestorm-0~20151006git103e6fd.orig/icemulti/Makefile
-+++ icestorm-0~20151006git103e6fd/icemulti/Makefile
+Index: icestorm/icemulti/Makefile
+===================================================================
+--- icestorm.orig/icemulti/Makefile	2015-10-08 08:36:26.843035669 +0200
++++ icestorm/icemulti/Makefile	2015-10-08 08:36:58.549608012 +0200
 @@ -1,7 +1,7 @@
  # CXX = clang
  CXX ?= clang
  LDLIBS = -lm -lstdc++
 -CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11
-+CXXFLAGS += -MD -O0 -ggdb -Wall -std=c++11
++CXXFLAGS += -std=c++11
  CC = $(CXX)
  DESTDIR = /usr/local
  
---- icestorm-0~20151006git103e6fd.orig/icepack/Makefile
-+++ icestorm-0~20151006git103e6fd/icepack/Makefile
+Index: icestorm/icepack/Makefile
+===================================================================
+--- icestorm.orig/icepack/Makefile	2015-10-08 08:36:26.843035669 +0200
++++ icestorm/icepack/Makefile	2015-10-08 08:36:46.837429230 +0200
 @@ -1,7 +1,7 @@
  # CXX = clang
  CXX ?= clang
  LDLIBS = -lm -lstdc++
 -CXXFLAGS = -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
-+CXXFLAGS += -MD -O0 -ggdb -Wall -std=c++11 -I/usr/local/include
++CXXFLAGS += -std=c++11
  CC = $(CXX)
  DESTDIR = /usr/local
  
---- icestorm-0~20151006git103e6fd.orig/iceprog/Makefile
-+++ icestorm-0~20151006git103e6fd/iceprog/Makefile
+Index: icestorm/iceprog/Makefile
+===================================================================
+--- icestorm.orig/iceprog/Makefile	2015-10-08 08:36:26.843035669 +0200
++++ icestorm/iceprog/Makefile	2015-10-08 08:37:21.418286898 +0200
 @@ -1,6 +1,6 @@
  # CC = clang
  LDLIBS = -L/usr/local/lib -lftdi -lm
 -CFLAGS = -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
-+CFLAGS += -MD -O0 -ggdb -Wall -std=c99 -I/usr/local/include
++CFLAGS += -std=c99
  DESTDIR = /usr/local
  
  all: iceprog

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/icestorm.git