[saods9] 01/01: Fix remaining hardeing problems
Ole Streicher
olebole-guest at alioth.debian.org
Fri Aug 2 11:32:36 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository saods9.
commit 505618659dec63ed5a14c04c81b3772f3bb68367
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Aug 2 13:32:15 2013 +0200
Fix remaining hardeing problems
---
debian/patches/ds9_make_linux.patch | 73 ++++++++++++++++++++-
debian/patches/ds9_use_external_libs.patch | 58 +---------------
debian/patches/saotk_avoid_compile_warnings.patch | 36 ++++++++++
3 files changed, 108 insertions(+), 59 deletions(-)
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index a77e9be..dee5a6e 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -12,7 +12,7 @@ Description: Set the compile flags according to the Debian environment. We
X11LIB = /usr/X11R6/lib
-XX = -O2
-+XX = $(FLAGS) -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/tcl -I/usr/include/tk -I/usr/include/freetype2
++XX := $(CFLAGS) -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/usr/include/tcl -I/usr/include/tk -I/usr/include/freetype2
YY = -gstabs+ -fno-inline
ZZ =
@@ -37,6 +37,66 @@ Description: Set the compile flags according to the Debian environment. We
CCOPT = ${OPTS} ${AA}
CCNOPT = ${NOPTS} ${AA}
+--- a/Makefile
++++ b/Makefile
+@@ -210,9 +210,9 @@
+
+ blt : FORCE
+ @echo "Installing BLT..."
+- cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) --with-tk=$(root)/$(TKDIRDIR) $(BLTFLAGS) --disable-shared
+- cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_static
+- cp $(BLTDIR)/src/*.a lib/.
++ cd $(BLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS) $(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LDFLAGS) $(LIBS)' ./configure --prefix $(root) $(BLTFLAGS) --enable-shared
++ $(MAKE) -C $(BLTDIR)/src -j $(JOBS) build_shared D_LDFLAGS='$(LDFLAGS)'
++ cp $(BLTDIR)/src/*.so* lib/.
+ cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
+
+ zlib : FORCE
+@@ -228,13 +228,13 @@
+
+ tkimg : libtiff
+ @echo "Installing TKIMG..."
+- cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) --with-tk=$(root)/$(TKDIRDIR) $(TKIMGFLAGS) --disable-shared --disable-threads
++ cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LDFLAGS) $(LIBS)' ./configure --prefix $(root) --disable-shared --disable-threads
+ $(MAKE) -C $(TKIMGDIR) -j $(JOBS) install
+
+ libtiff : FORCE
+ @echo "Installing LIBTIFF..."
+ cd $(TKIMGDIR)/compat/libtiff; CC='$(CC)' CFLAGS='$(OPTS)' CXX='$(CC)' CXXFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared
+- $(MAKE) -C $(TKIMGDIR)/compat/libtiff -j $(JOBS) install
++ $(MAKE) -C $(TKIMGDIR)/compat/libtiff -j $(JOBS) CXXOPT="$(CXXOPT)" install
+
+ tkmpeg : FORCE
+ @echo "Installing TKMPEG..."
+@@ -242,7 +242,7 @@
+
+ tkhtml : $(HTMLDIR)
+ @echo "Installing TKHTML..."
+- cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no
++ cd $(HTMLDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS) $(CXXOPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LDFLAGS) $(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
+ $(MAKE) -C $(HTMLDIR) headers libtkhtml.a
+ cp $(HTMLDIR)/libtkhtml.a lib/.
+
+@@ -305,7 +305,7 @@
+
+ saotk : FORCE
+ @echo "Installing SAOTK..."
+- $(MAKE) -C $(SAOTKDIR) -j $(JOBS) install
++ $(MAKE) -C $(SAOTKDIR) CXX="$(CXX)" CXXOPT='$(CXXOPT)' -j $(JOBS) install
+
+ zvfs : FORCE
+ @echo "Installing ZVFS..."
+--- a/ds9/Makefile
++++ b/ds9/Makefile
+@@ -287,7 +287,7 @@
+ #--------------------------support
+
+ $(MAIN).o : $(MAIN).c
+- $(CC) $(CFLAGS) -DTK_LOCAL_APPINIT=SAOAppInit \
++ $(CC) $(CPPFLAGS) $(CFLAGS) -DTK_LOCAL_APPINIT=SAOAppInit \
+ -DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c $(MAIN).c -o $@
+
+ $(MAIN).c : $(MAINDIR)/$(MAIN).c
--- a/checkdns/Makefile
+++ b/checkdns/Makefile
@@ -1,7 +1,7 @@
@@ -112,7 +172,7 @@ Description: Set the compile flags according to the Debian environment. We
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 " @BUILD_CC@ @CPPFLAGS@ @BUILD_CFLAGS@ @LDFLAGS@ -o $n $src $libs"
puts ""
global cleanable; lappend cleanable $n
}
@@ -135,6 +195,15 @@ Description: Set the compile flags according to the Debian environment. We
DEFINES = @DEFINES@
EXTRA_CFLAGS = @GCCFLAGS@ $(SO_CFLAGS)
LDFLAGS = @LDFLAGS@ @LD_RUN_PATH@
+@@ -22,7 +23,7 @@
+ SO_EXT = @BLT_SO_EXT@
+ SO_PREFIX = @BLT_SO_PREFIX@
+ SO_LD = @BLT_SO_LD@
+-SO_LDFLAGS = @BLT_SO_LDFLAGS@ @LD_RUN_PATH@
++SO_LDFLAGS = $(D_LDFLAGS) @BLT_SO_LDFLAGS@ @LD_RUN_PATH@
+
+ EXPAT_INC_SPEC = @EXPAT_INC_SPEC@
+ EXPAT_LIB_SPEC = @EXPAT_LIB_SPEC@
@@ -375,8 +376,8 @@
$(srcdir)/bltTree.h \
$(srcdir)/bltVector.h
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index d027dfa..54e32ee 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -237,62 +237,6 @@ Description: Compile against external libraries of wcstools, funtools, ast,
return TCL_ERROR;
--- a/Makefile
+++ b/Makefile
-@@ -210,9 +210,9 @@
-
- blt : FORCE
- @echo "Installing BLT..."
-- cd $(BLTDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) --with-tk=$(root)/$(TKDIRDIR) $(BLTFLAGS) --disable-shared
-- cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_static
-- cp $(BLTDIR)/src/*.a lib/.
-+ cd $(BLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' ./configure --prefix $(root) $(BLTFLAGS) --enable-shared
-+ cd $(BLTDIR)/src; $(MAKE) -j $(JOBS) build_shared
-+ cp $(BLTDIR)/src/*.so* lib/.
- cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
-
- zlib : FORCE
-@@ -228,13 +228,13 @@
-
- tkimg : libtiff
- @echo "Installing TKIMG..."
-- cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) --with-tk=$(root)/$(TKDIRDIR) $(TKIMGFLAGS) --disable-shared --disable-threads
-+ cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared --disable-threads
- $(MAKE) -C $(TKIMGDIR) -j $(JOBS) install
-
- libtiff : FORCE
- @echo "Installing LIBTIFF..."
- cd $(TKIMGDIR)/compat/libtiff; CC='$(CC)' CFLAGS='$(OPTS)' CXX='$(CC)' CXXFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared
-- $(MAKE) -C $(TKIMGDIR)/compat/libtiff -j $(JOBS) install
-+ $(MAKE) -C $(TKIMGDIR)/compat/libtiff -j $(JOBS) CXXOPT="$(CXXOPT)" install
-
- tkmpeg : FORCE
- @echo "Installing TKMPEG..."
-@@ -242,7 +242,7 @@
-
- tkhtml : $(HTMLDIR)
- @echo "Installing TKHTML..."
-- cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no
-+ cd $(HTMLDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CXXOPTS) -DUSE_INTERP_RESULT' LDFLAGS='$(LIBS)' $(PRETKHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
- $(MAKE) -C $(HTMLDIR) headers libtkhtml.a
- cp $(HTMLDIR)/libtkhtml.a lib/.
-
-@@ -251,7 +251,7 @@
-
- xpa : FORCE
- @echo "Installing XPA..."
-- cd $(XPADIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) $(XPAFLAGS) --disable-shared
-+ cd $(XPADIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared
- $(MAKE) -C $(XPADIR) -j $(JOBS) install
- cd bin; strip xpa*
-
-@@ -305,7 +305,7 @@
-
- saotk : FORCE
- @echo "Installing SAOTK..."
-- $(MAKE) -C $(SAOTKDIR) -j $(JOBS) install
-+ $(MAKE) -C $(SAOTKDIR) CXX="$(CXX)" -j $(JOBS) install
-
- zvfs : FORCE
- @echo "Installing ZVFS..."
@@ -327,15 +327,10 @@
find . -name "*stackdump*" -exec rm {} \;
endif
@@ -307,7 +251,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- saotkclean zvfsclean ds9clean srcclean \
- filesclean dirsclean
+distclean : filesclean \
-+ bltclean tkmpegclean iisclean checkdnsclean \
++ bltclean tkmpegclean tkhtmlclean iisclean checkdnsclean \
+ riceclean hcompressclean plioclean $(OPTDIRCLEAN) \
+ saotkclean ds9clean srcclean dirsclean
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index 680c092..002c440 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -51,3 +51,39 @@ Description: Avoid compile time warnings in the saotk subsystem
this->ext_++;
this->found();
return;
+--- a/saotk/colorbar/cbgrid.C
++++ b/saotk/colorbar/cbgrid.C
+@@ -122,19 +122,19 @@
+ if (!(frameSet = astFrameSet(astFrame(2,"Domain=WIDGET"),"")))
+ goto error;
+
+- if (!(bb = astUnitMap(1,"")))
++ if (!(bb = astUnitMap(1,"%s", "")))
+ goto error;
+
+ if (!opts->orientation) {
+- if (!(aa = astLutMap(cnt_, lut_, 0, double(opts->width)/(cnt_-1), "")))
++ if (!(aa = astLutMap(cnt_, lut_, 0, double(opts->width)/(cnt_-1), "%s", "")))
+ goto error;
+- if (!(cmp = astCmpMap(aa, bb, 0, "")))
++ if (!(cmp = astCmpMap(aa, bb, 0, "%s", "")))
+ goto error;
+ }
+ else {
+- if (!(aa = astLutMap(cnt_, lut_, 0, double(opts->height)/(cnt_-1), "")))
++ if (!(aa = astLutMap(cnt_, lut_, 0, double(opts->height)/(cnt_-1), "%s", "")))
+ goto error;
+- if (!(cmp = astCmpMap(bb, aa, 0, "")))
++ if (!(cmp = astCmpMap(bb, aa, 0, "%s", "")))
+ goto error;
+ }
+
+@@ -196,7 +196,7 @@
+ pbox[3] = 0;
+ }
+
+- plot = astPlot(frameSet, gbox, pbox, option_);
++ plot = astPlot(frameSet, gbox, pbox, "%s", option_);
+
+ // and now create astGrid
+ astGrid2dPtr = this;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/saods9.git
More information about the debian-science-commits
mailing list