Drop test-libs.patch, fixed upstream.

[debian/iodine.git] / debian / patches / cflags.patch

diff --git a/debian/patches/cflags.patch b/debian/patches/cflags.patch
index cb7fd0d944c3ed900d8212bac2fa92a402c6db8b..e743fdebf3248bd34614a4f7158f67ff44ff5ce9 100644 (file)
--- a/debian/patches/cflags.patch
+++ b/debian/patches/cflags.patch
@@ -2,7 +2,7 @@ Description: remove from CFLAGS what gets passed by Debian build system
 Forwarded: no
 Origin: vendor
 Author: gregor herrmann <gregoa@debian.org>
-Last-Update: 2010-07-03
+Last-Update: 2014-10-05
 
 --- a/src/Makefile
 +++ b/src/Makefile
@@ -10,19 +10,19 @@ Last-Update: 2010-07-03
  
  LIBPATH = -L.
  LDFLAGS +=  -lz `sh osflags $(TARGETOS) link` $(LIBPATH)
--CFLAGS += -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
-+CFLAGS += -c -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
+-CFLAGS += -std=c99 -c -g -Wall -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags`
++CFLAGS += -std=c99 -c -D$(OS) -pedantic `sh osflags $(TARGETOS) cflags` $(CPPFLAGS)
  
  all: stateos $(CLIENT) $(SERVER)
  
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -7,7 +7,7 @@
+@@ -6,7 +6,7 @@
  
  CHECK_PATH = /usr/local
- LDFLAGS = -L$(CHECK_PATH)/lib -lcheck `../src/osflags link`
--CFLAGS = -g -Wall -D$(OS) -I../src -I$(CHECK_PATH)/include -pedantic `../src/osflags cflags`
-+CFLAGS += -D$(OS) -I../src -I$(CHECK_PATH)/include -pedantic `../src/osflags cflags`
+ LDFLAGS = -L$(CHECK_PATH)/lib `pkg-config check --libs` -lpthread `sh ../src/osflags $(TARGETOS) link`
+-CFLAGS = -std=c99 -g -Wall -D$(OS) `pkg-config check --cflags` -I../src -I$(CHECK_PATH)/include -pedantic `sh ../src/osflags $(TARGETOS) cflags`
++CFLAGS = -std=c99 -D$(OS) `pkg-config check --cflags` -I../src -I$(CHECK_PATH)/include -pedantic `sh ../src/osflags $(TARGETOS) cflags` $(CPPFLAGS)
  
  all: $(TEST)
        @LD_LIBRARY_PATH=${CHECK_PATH}/lib ./$(TEST)