1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Description: enable additional tests and set hardening flags.
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2014-09-06
Index: gnuplot-iostream-0~20140302.gitc8919a0+dfsg/Makefile
===================================================================
--- gnuplot-iostream-0~20140302.gitc8919a0+dfsg.orig/Makefile
+++ gnuplot-iostream-0~20140302.gitc8919a0+dfsg/Makefile
@@ -26,12 +26,12 @@
# The -O0 option speeds up the compile, which is good for testing. This should
# never be used for production since the generated code is extremely slow!
-CXXFLAGS+=-Wall -Wextra -O0 -g
-LDFLAGS+=-lutil -lboost_iostreams -lboost_system -lboost_filesystem
+CXXFLAGS+=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS+= $(shell dpkg-buildflags --get CXXFLAGS) -lutil -lboost_iostreams -lboost_system -lboost_filesystem
# This makes the examples and tests more complete, but only works if you have the corresponding
# libraries installed.
-#CXXFLAGS+=--std=c++11 -DUSE_ARMA=1 -DUSE_BLITZ=1
+CXXFLAGS+=--std=c++11 -DUSE_ARMA=1
ALL_EXAMPLES=example-misc example-data-1d example-data-2d example-interactive
TEST_BINARIES=test-noncopyable test-outputs
@@ -71,7 +71,6 @@ test: $(TEST_BINARIES) test-asserts
mkdir -p unittest-output
rm -f unittest-output/*
./test-outputs
- diff -qr unittest-output unittest-output-good
clean:
rm -f *.o
Index: gnuplot-iostream-0~20140302.gitc8919a0+dfsg/legacy/Makefile
===================================================================
--- gnuplot-iostream-0~20140302.gitc8919a0+dfsg.orig/legacy/Makefile
+++ gnuplot-iostream-0~20140302.gitc8919a0+dfsg/legacy/Makefile
@@ -1,7 +1,7 @@
CXXFLAGS+=-Wall -Wextra -I.. -O0 -g
# Don't warn about the fact that we use the deprecated send() function.
-CXXFLAGS+=-Wno-deprecated-declarations
-LDFLAGS+=-lutil -lboost_iostreams -lboost_system -lboost_filesystem
+CXXFLAGS+=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS+= $(shell dpkg-buildflags --get LDFLAGS) -lutil -lboost_iostreams -lboost_system -lboost_filesystem
EVERYTHING=examples examples-blitz examples-interactive
|
