[SCM] image display tool for astronomy branch, debian, updated. upstream/7.0.1+dfsg-171-gca6d8e0

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 81835a80c84b0e60b08de1bea8f9f88e7cb7dfda
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jul 19 11:12:23 2012 +0200

    Propagate build flags for hardening

diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 6c476d8..dba859d 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -1,5 +1,6 @@
 Author: Ole Streicher <debian at liska.ath.cx>
-Description: Set the compile flags according to the Debian environment.
+Description: Set the compile flags according to the Debian environment. We 
+ also need to propagate the standard CFLAGS, CPPFLAGS, CXXFLAGS, LDFLAGS here.
 --- a/make.linux
 +++ b/make.linux
 @@ -1,29 +1,26 @@
@@ -39,3 +40,127 @@ Description: Set the compile flags according to the Debian environment.
  CCOPT	= ${OPTS} ${AA}
  CCNOPT	= ${NOPTS} ${AA}
  
+--- a/Makefile
++++ b/Makefile
+@@ -281,7 +281,7 @@
+ 
+ blt	: FORCE
+ 	@echo "Installing BLT..."
+-	cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --exec_prefix $(root) $(BLTFLAGS) --enable-shared --cache-file=$(CACHE)
++	cd $(BLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(OPTS) $(CFLAGS)' LDFLAGS='$(LDFLAGS)' ./configure --prefix $(root) --exec_prefix $(root) $(BLTFLAGS) --enable-shared --cache-file=$(CACHE)
+ 	cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_shared
+ 	cp $(BLTDIR)/src/*.so* lib/.
+ 	cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
+@@ -313,7 +313,7 @@
+ 
+ html	: FORCE
+ 	@echo "Installing HTMLWIDGET..."
+-	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(CXXOPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no --cache-file=$(CACHE)
++	cd $(HTMLDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CXXOPTS) $(CXXFLAGS)' LDFLAGS='$(LDFLAGS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no --cache-file=$(CACHE)
+ 	cd $(HTMLDIR); $(MAKE) headers libtkhtml.a
+ 	cp $(HTMLDIR)/libtkhtml.a lib/.
+ 
+--- a/checkdns/Makefile
++++ b/checkdns/Makefile
+@@ -1,6 +1,6 @@
+ include ../make.include
+ 
+-CFLAGS	= $(CCOPT) -I../include
++CFLAGS	+= $(CCOPT) -I../include
+ 
+ SRC	= checkdns.c
+ 
+--- a/hcompress/Makefile
++++ b/hcompress/Makefile
+@@ -1,6 +1,6 @@
+ include ../make.include
+ 
+-CFLAGS	= $(CCOPT) -I.
++CFLAGS	+= $(CCOPT) -I.
+ 
+ SRC	= hdecompress.c
+ 
+--- a/iis/Makefile
++++ b/iis/Makefile
+@@ -1,7 +1,7 @@
+ include ../make.include
+ 
+-CXXFLAGS = $(CXXOPT) -I../include
+-CFLAGS = $(CCOPT) -I../include
++CXXFLAGS += $(CXXOPT) -I../include
++CFLAGS += $(CCOPT) -I../include
+ 
+ SRC	= iistcl.C xim.C
+ CSRC	= iis.c util.c
+--- a/plio/Makefile
++++ b/plio/Makefile
+@@ -1,6 +1,6 @@
+ include ../make.include
+ 
+-CFLAGS	= $(CCOPT) -I.
++CFLAGS	+= $(CCOPT) -I.
+ 
+ SRC	= pliocomp.c
+ 
+--- a/rice/Makefile
++++ b/rice/Makefile
+@@ -1,6 +1,6 @@
+ include ../make.include
+ 
+-CFLAGS	= $(CCOPT) -I.
++CFLAGS	+= $(CCOPT) -I.
+ 
+ SRC	= ricecomp.c
+ 
+--- a/saotk/Makefile
++++ b/saotk/Makefile
+@@ -5,7 +5,7 @@
+ 
+ #--------------------------defines
+ 
+-CXXFLAGS = $(CXXOPT) -I../include -I$(X11INCLUDE)
++CXXFLAGS += $(CXXOPT) -I../include -I$(X11INCLUDE)
+ 
+ DIRS	= widget frame colorbar panner magnifier vector list fitsy++ util
+ 
+--- a/htmlwidget/makemake.tcl.in
++++ b/htmlwidget/makemake.tcl.in
+@@ -91,7 +91,7 @@
+   global BEXE
+   set n "${name}$BEXE"
+   puts "$n:	$src"
+-  puts "	@BUILD_CC@ @BUILD_CFLAGS@ -o $n $src $libs"
++  puts "	@BUILD_CC@ @CPPFLAGS@ @BUILD_CFLAGS@ -o $n $src $libs"
+   puts ""
+   global cleanable; lappend cleanable $n
+ }
+@@ -196,7 +196,7 @@
+ #
+ proc MakeObj {name src {dep {}}} {
+   set n $name
+-  set cc "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
++  set cc "@TARGET_CC@ @CPPFLAGS@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
+   append cc " @TARGET_X_INC@"
+   append cc " @TARGET_TK_INC@ @TARGET_BLT_INC@"
+   puts "$n:	$src $dep"
+--- a/blt3.0.1/src/Makefile.in
++++ b/blt3.0.1/src/Makefile.in
+@@ -10,6 +10,7 @@
+ BLT_LIBRARY =		@BLT_LIBRARY@
+ CC =			@CC@
+ CFLAGS =		@CFLAGS@ 
++CPPFLAGS =		@CPPFLAGS@
+ DEFINES =		@DEFINES@
+ EXTRA_CFLAGS =		@GCCFLAGS@ $(SO_CFLAGS) 
+ LDFLAGS =		@LDFLAGS@ @LD_RUN_PATH@
+@@ -374,8 +375,8 @@
+ 			$(srcdir)/bltTree.h \
+ 			$(srcdir)/bltVector.h 
+ 
+-CC_OPTS =		$(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
+-MAIN_CC_OPTS =		$(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
++CC_OPTS =		$(CPPFLAGS) $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
++MAIN_CC_OPTS =		$(CPPFLAGS) $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
+ INSTALL =		@INSTALL@
+ INSTALL_DATA =		@INSTALL_DATA@
+ INSTALL_ROOT =  

-- 
image display tool for astronomy