Package: fbi / 2.10-3

dbg-strip-harden.diff Patch series | download
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
diff -aur fbi-2.10.orig/GNUmakefile fbi-2.10/GNUmakefile
--- fbi-2.10.orig/GNUmakefile	2015-03-31 16:07:23.000000000 +0200
+++ fbi-2.10/GNUmakefile	2015-04-26 13:27:19.017947340 +0200
@@ -9,6 +9,7 @@
 # fixup flags
 CFLAGS	+= -DVERSION='"$(VERSION)"' -I$(srcdir)
 CFLAGS	+= -Wno-pointer-sign
+CFLAGS	+= -g
 
 # default target
 all: build
@@ -69,6 +70,8 @@
   ida fbi : LDFLAGS  += -Wl,--wrap=fopen
 endif
 
+ida fbi : LDFLAGS  += `dpkg-buildflags --get LDFLAGS`
+
 PKG_CONFIG = pkg-config
 
 ########################################################################
diff -aur fbi-2.10.orig/mk/Variables.mk fbi-2.10/mk/Variables.mk
--- fbi-2.10.orig/mk/Variables.mk	2015-03-31 16:07:23.000000000 +0200
+++ fbi-2.10/mk/Variables.mk	2015-04-26 13:28:14.546222721 +0200
@@ -30,17 +30,18 @@
 
 STRIP		?= -s
 INSTALL		?= install
-INSTALL_BINARY  := $(INSTALL) $(STRIP)
+INSTALL_BINARY  := $(INSTALL)
 INSTALL_SCRIPT  := $(INSTALL)
 INSTALL_DATA	:= $(INSTALL) -m 644
 INSTALL_DIR	:= $(INSTALL) -d
 
 # cflags
-CFLAGS		?= -g -O2
+CFLAGS  	?= $(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS	?= $(CFLAGS)
 CFLAGS		+= -Wall -Wmissing-prototypes -Wstrict-prototypes \
 		   -Wpointer-arith -Wunused
 CXXFLAGS	+= -Wall -Wpointer-arith -Wunused
+CFLAGS		+= $(shell dpkg-buildflags --get CPPFLAGS)
 
 # add /usr/local to the search path if something is in there ...
 ifneq ($(wildcard /usr/local/include/*.h),)
@@ -48,8 +49,12 @@
   LDFLAGS += -L/usr/local/$(LIB)
 endif
 
+LDFLAGS 	?= $(shell dpkg-buildflags --get LDFLAGS)
+
 # fixup include path for $(srcdir) != "."
 ifneq ($(srcdir),.)
   CFLAGS  += -I. -I$(srcdir)
 endif
 
+
+