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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
|
From: Ole Streicher <olebole@debian.org>
Date: Fri, 22 Jul 2016 14:45:12 +0200
Subject: Propagate CFLAGS etc. for hardening
QFitsView/QFitsView.pro | 14 +++++++-------
QFitsView/QFitsView_dll.pro | 1 -
dpuser/Makefile | 28 ++++++++++++++--------------
utils/Makefile | 12 ++++++------
4 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/QFitsView/QFitsView.pro b/QFitsView/QFitsView.pro
index ea5a794..88806e6 100644
@@ -1,3 +1,9 @@
+QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
+QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS)
+QMAKE_CFLAGS += $$QMAKE_CPPFLAGS
+QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
+QMAKE_CXXFLAGS += $$QMAKE_CPPFLAGS
+QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS)
# To disable VTK, search for
# "contains(QT, opengl):DEFINES += HAS_VTK"
@@ -62,12 +68,7 @@ win32 {
}
} else:unix {
ARCH = LINUX
- contains(QMAKE_HOST.arch, x86_64):{
- ARCHBIT = 64
- } else {
- ARCHBIT = 32
- }
- QMAKE_LFLAGS += " -static-libstdc++ -static-libgcc "
+# QMAKE_LFLAGS += " -static-libstdc++ -static-libgcc "
} else:message(">>> ERROR: Unsupported platform!")
##### set OpenGL #####
@@ -76,7 +77,6 @@ win32 {
# ### set CONFIG ################
CONFIG += qt c++11 \
- warn_off \
thread
win32:qf_static {
# MinGW, Win32, static QFitsView
diff --git a/QFitsView/QFitsView_dll.pro b/QFitsView/QFitsView_dll.pro
index baa73d4..07717fe 100644
@@ -31,7 +31,6 @@ QT += script \
#### set CONFIG ################
CONFIG += qt \
- warn_off \
dll
#### set VTK_PATH ################
diff --git a/dpuser/Makefile b/dpuser/Makefile
index 73048cf..2408390 100644
@@ -27,10 +27,10 @@
#
################################################################################
RM = rm -f
-SED = sed
-CC = gcc
-CXX = g++
-LINK = g++
+SED ?= sed
+CC ?= gcc
+CXX ?= g++
+LINK ?= $(CXX)
QF =
#GDL = -DHAS_GDL
PY =
@@ -62,8 +62,8 @@ ifeq ($(QF), -qt)
DEFINES += -DDPQT -DNO_READLINE
endif
-CFLAGS = -pipe -O2 -D_REENTRANT -w $(DEFINES)
-CXXFLAGS = -pipe -O2 -std=c++11 -Wno-narrowing -D_REENTRANT -w $(DEFINES)
+CFLAGS += -D_REENTRANT -g -w $(DEFINES) $(CPPFLAGS)
+CXXFLAGS += -std=c++11 -Wno-narrowing -D_REENTRANT -w $(DEFINES) $(CPPFLAGS)
INCPATH = -I. -I../utils -I../libfits -I../include -Iparser -I.
ifeq ($(GDL), -DHAS_GDL)
@@ -291,16 +291,16 @@ static: parsers
else # end WIN, start LINUX & MACOSX
static: doc/helpmap.cpp parsers
$(MAKE) $(MULTIPROZGEIL) $(TARGET_LINUX)
-endif # end LINUX & MACOSX
-
-$(TARGET_DLL): $(DLL_OBJECTS)
- g++ -shared -o $(TARGET_DLL) $(DLL_OBJECTS) $(DLL_LIBS)
-
-$(TARGET_WIN): $(OBJECTS)
- $(LINK) $(LDFLAG) -o $(TARGET_WIN) $(OBJECTS) $(LIBS)
+endif # end LINUX & MACOSX
+
+$(TARGET_DLL): $(DLL_OBJECTS)
+ $(LINK) -shared -o $(TARGET_DLL) $(DLL_OBJECTS) $(DLL_LIBS)
+
+$(TARGET_WIN): $(OBJECTS)
+ $(LINK) $(LDFLAG) -o $(TARGET_WIN) $(OBJECTS) $(LIBS)
$(TARGET_LINUX): $(OBJECTS)
- $(LINK) $(LDFLAG) -o $(TARGET_LINUX) $(OBJECTS) $(LIBS)
+ $(LINK) $(LDFLAG) -o $(TARGET_LINUX) $(OBJECTS) $(LDFLAGS) $(LIBS)
# Builds parser-, dpuser2c & idl2c-source-files
parsers: parsers_qf
diff --git a/utils/Makefile b/utils/Makefile
index 62418b0..9200303 100644
@@ -8,12 +8,12 @@
####### Compiler, tools and options
-CC = gcc
-CXX = g++
-LEX = flex
-YACC = yacc
-CFLAGS = -pipe -Wall -W -O2 -DQT_NO_DEBUG
-CXXFLAGS = -pipe -Wall -W -O2 -DQT_NO_DEBUG
+CC ?= gcc
+CXX ?= g++
+LEX ?= flex
+YACC ?= yacc
+CFLAGS += -DQT_NO_DEBUG
+CXXFLAGS += -DQT_NO_DEBUG
LEXFLAGS =
YACCFLAGS = -d
INCPATH = -I/afs/mpe/home/ott/qt-x11-free-3.3.1/mkspecs/default -I. -I$(QTDIR)/include
|
