[SCM] Image Reduction and Analysis Facility branch, debian, updated. 457b1e7b8f3328a95d279f9c122c33dd1e8ab65c
Ole Streicher
debian at liska.ath.cx
Mon Jun 3 14:33:09 UTC 2013
The following commit has been merged in the debian branch:
commit b5e319e933cb71825dcb8aac69796d607f039417
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Jun 3 10:50:32 2013 +0200
Better way to propagate CFLAGS
diff --git a/debian/patches/cflags.patch b/debian/patches/cflags.patch
index d9af333..8982272 100644
--- a/debian/patches/cflags.patch
+++ b/debian/patches/cflags.patch
@@ -1,3 +1,5 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Propagate CFLAGS and CC to Makefiles.
--- a/vendor/voclient/libsamp/libxrpc/Makefile
+++ b/vendor/voclient/libsamp/libxrpc/Makefile
@@ -26,7 +26,7 @@
@@ -127,269 +129,6 @@
Shared:
/bin/mkdir $@
chmod 777 $@
---- a/unix/boot/bootlib/mkpkg.sh
-+++ b/unix/boot/bootlib/mkpkg.sh
-@@ -1,14 +1,14 @@
- # Make the bootstrap utilities library (bootlib).
-
- if test -f ../../as/bytmov.s; then\
-- $CC -c $HSI_CF ../../as/bytmov.s -o bytmov.o;\
-+ $CC $CFLAGS -c $HSI_CF ../../as/bytmov.s -o bytmov.o;\
- else\
-- $CC -c $HSI_CF _bytmov.c;\
-+ $CC $CFLAGS -c $HSI_CF _bytmov.c;\
- fi
-
- # $CC -c $HSI_CF [a-z]*.c
- for i in [a-z]*.c ;\
--do $CC -c $HSI_CF $i ;\
-+do $CC $CFLAGS -c $HSI_CF $i ;\
- done
-
- ar rv libboot.a *.o; rm *.o
---- a/unix/boot/generic/mkpkg.sh
-+++ b/unix/boot/generic/mkpkg.sh
-@@ -5,14 +5,14 @@
-
- find tok.l -newer lexyy.c -exec rm lexyy.c \;
- if test -f lexyy.c; then\
-- $CC -c $HSI_CF lexyy.c;\
-+ $CC $CFLAGS -c $HSI_CF lexyy.c;\
- else\
- lex tok.l;\
- sed -f lex.sed lex.yy.c > lexyy.c; rm lex.yy.c;\
-- $CC -c $HSI_CF lexyy.c;\
-+ $CC $CFLAGS -c $HSI_CF lexyy.c;\
- fi
-
--$CC -c $HSI_CF generic.c chario.c yywrap.c
--$CC $HSI_LF generic.o lexyy.o chario.o yywrap.o $HSI_LIBS -o generic.e
-+$CC $CFLAGS -c $HSI_CF generic.c chario.c yywrap.c
-+$CC $CFLAGS $HSI_LF generic.o lexyy.o chario.o yywrap.o $HSI_LIBS -o generic.e
- mv -f generic.e ../../hlib
- rm *.o
---- a/unix/boot/mkpkg/mkpkg.sh
-+++ b/unix/boot/mkpkg/mkpkg.sh
-@@ -1,8 +1,8 @@
- # Bootstrap MKPKG.
-
--$CC -c $HSI_CF char.c fdcache.c fncache.c host.c main.c pkg.c scanlib.c\
-+$CC $CFLAGS -c $HSI_CF char.c fdcache.c fncache.c host.c main.c pkg.c scanlib.c\
- sflist.c tok.c
--$CC $HSI_LF main.o char.o fdcache.o fncache.o host.o pkg.o scanlib.o\
-+$CC $CFLAGS $HSI_LF main.o char.o fdcache.o fncache.o host.o pkg.o scanlib.o\
- sflist.o tok.o $HSI_LIBS -o mkpkg.e
-
- mv -f mkpkg.e ../../hlib
---- a/unix/boot/rmbin/mkpkg.sh
-+++ b/unix/boot/rmbin/mkpkg.sh
-@@ -1,6 +1,6 @@
- # Make and install the RMBIN utility.
-
--$CC -c $HSI_CF rmbin.c
--$CC $HSI_LF rmbin.o $HSI_LIBS -o rmbin.e
-+$CC $CFLAGS -c $HSI_CF rmbin.c
-+$CC $CFLAGS $HSI_LF rmbin.o $HSI_LIBS -o rmbin.e
- mv -f rmbin.e ../../hlib
- rm *.o
---- a/unix/boot/rmfiles/mkpkg.sh
-+++ b/unix/boot/rmfiles/mkpkg.sh
-@@ -1,6 +1,6 @@
- # Make and install the RMFILES utility.
-
--$CC -c $HSI_CF rmfiles.c
--$CC $HSI_LF rmfiles.o $HSI_LIBS -o rmfiles.e
-+$CC $CFLAGS -c $HSI_CF rmfiles.c
-+$CC $CFLAGS $HSI_LF rmfiles.o $HSI_LIBS -o rmfiles.e
- mv -f rmfiles.e ../../hlib
- rm *.o
---- a/unix/boot/rtar/mkpkg.sh
-+++ b/unix/boot/rtar/mkpkg.sh
-@@ -1,6 +1,6 @@
- # Bootstrap RTAR.
-
--$CC -c $HSI_CF rtar.c
--$CC $HSI_LF rtar.o $HSI_LIBS -o rtar.e
-+$CC $CFLAGS -c $HSI_CF rtar.c
-+$CC $CFLAGS $HSI_LF rtar.o $HSI_LIBS -o rtar.e
- mv rtar.e ../../hlib
- rm -f rtar.o
---- a/unix/boot/spp/mkpkg.sh
-+++ b/unix/boot/spp/mkpkg.sh
-@@ -1,8 +1,8 @@
- # Make the Subset Preprocessor language (SPP) compiler.
-
- echo "----------------------- XC ----------------------------"
--$CC -c $HSI_CF xc.c
--$CC $HSI_LF xc.o $HSI_LIBS -o xc.e
-+$CC $CFLAGS -c $HSI_CF xc.c
-+$CC $CFLAGS $HSI_LF xc.o $HSI_LIBS -o xc.e
- mv -f xc.e ../../hlib
- rm -f xc.o
-
---- a/unix/boot/spp/rpp/mkpkg.sh
-+++ b/unix/boot/spp/rpp/mkpkg.sh
-@@ -7,7 +7,7 @@
- echo "----------------------- RATLIBC ------------------------"
- (cd ratlibc; sh -x mkpkg.sh)
-
--$CC -c $HSI_CF rpp.c
--$CC $HSI_LF rpp.o librpp.a libf.a libc.a $HSI_F77LIBS -o rpp.e
-+$CC $CFLAGS -c $HSI_CF rpp.c
-+$CC $CFLAGS $HSI_LF rpp.o librpp.a libf.a libc.a $HSI_F77LIBS -o rpp.e
- mv -f rpp.e ../../../hlib
- rm *.[ao]
---- a/unix/boot/spp/rpp/ratlibc/mkpkg.sh
-+++ b/unix/boot/spp/rpp/ratlibc/mkpkg.sh
-@@ -1,6 +1,6 @@
- # Host system interface for the RPP program.
-
--$CC -c -g $HSI_CF cant.c close.c endst.c getarg.c getlin.c initst.c open.c\
-+$CC $CFLAGS -c -g $HSI_CF cant.c close.c endst.c getarg.c getlin.c initst.c open.c\
- putch.c putlin.c r4tocstr.c remark.c
-
- ar rv libc.a *.o
---- a/unix/boot/spp/rpp/ratlibf/mkpkg.sh
-+++ b/unix/boot/spp/rpp/ratlibf/mkpkg.sh
-@@ -1,16 +1,16 @@
- # Utility library subroutines for RPP.
-
--$F77 -c $HSI_FF addset.f addstr.f amatch.f catsub.f clower.f concat.f
--$F77 -c $HSI_FF ctoc.f ctoi.f ctomn.f cupper.f delete.f docant.f dodash.f
--$F77 -c $HSI_FF dsdbiu.f dsdump.f dsfree.f dsget.f dsinit.f enter.f equal.f
--$F77 -c $HSI_FF error.f errsub.f esc.f fcopy.f filset.f fmtdat.f fold.f
--$F77 -c $HSI_FF gctoi.f getc.f getccl.f getpat.f getwrd.f gfnarg.f index.f
--$F77 -c $HSI_FF insub.f itoc.f length.f locate.f lookup.f lower.f makpat.f
--$F77 -c $HSI_FF maksub.f match.f mktabl.f mntoc.f omatch.f outsub.f patsiz.f
--$F77 -c $HSI_FF prompt.f putc.f putdec.f putint.f putstr.f query.f rmtabl.f
--$F77 -c $HSI_FF scopy.f sctabl.f sdrop.f skipbl.f slstr.f stake.f stclos.f
--$F77 -c $HSI_FF stcopy.f stlu.f strcmp.f strim.f termin.f trmout.f type.f
--$F77 -c $HSI_FF upper.f wkday.f
-+$F77 $FFLAGS -c $HSI_FF addset.f addstr.f amatch.f catsub.f clower.f concat.f
-+$F77 $FFLAGS -c $HSI_FF ctoc.f ctoi.f ctomn.f cupper.f delete.f docant.f dodash.f
-+$F77 $FFLAGS -c $HSI_FF dsdbiu.f dsdump.f dsfree.f dsget.f dsinit.f enter.f equal.f
-+$F77 $FFLAGS -c $HSI_FF error.f errsub.f esc.f fcopy.f filset.f fmtdat.f fold.f
-+$F77 $FFLAGS -c $HSI_FF gctoi.f getc.f getccl.f getpat.f getwrd.f gfnarg.f index.f
-+$F77 $FFLAGS -c $HSI_FF insub.f itoc.f length.f locate.f lookup.f lower.f makpat.f
-+$F77 $FFLAGS -c $HSI_FF maksub.f match.f mktabl.f mntoc.f omatch.f outsub.f patsiz.f
-+$F77 $FFLAGS -c $HSI_FF prompt.f putc.f putdec.f putint.f putstr.f query.f rmtabl.f
-+$F77 $FFLAGS -c $HSI_FF scopy.f sctabl.f sdrop.f skipbl.f slstr.f stake.f stclos.f
-+$F77 $FFLAGS -c $HSI_FF stcopy.f stlu.f strcmp.f strim.f termin.f trmout.f type.f
-+$F77 $FFLAGS -c $HSI_FF upper.f wkday.f
-
- ar rv libf.a *.o
- $RANLIB libf.a
---- a/unix/boot/spp/rpp/rppfor/mkpkg.sh
-+++ b/unix/boot/spp/rpp/rppfor/mkpkg.sh
-@@ -1,20 +1,20 @@
- # Fortran source for RPP preprocessor.
-
--$F77 -c $HSI_FF addchr.f allblk.f alldig.f baderr.f balpar.f beginc.f
--$F77 -c $HSI_FF brknxt.f cascod.f caslab.f declco.f deftok.f doarth.f
--$F77 -c $HSI_FF docode.f doif.f doincr.f domac.f dostat.f dosub.f
--$F77 -c $HSI_FF eatup.f elseif.f endcod.f entdef.f entdkw.f entfkw.f
--$F77 -c $HSI_FF entrkw.f entxkw.f errchk.f errgo.f errorc.f evalr.f
--$F77 -c $HSI_FF finit.f forcod.f fors.f getdef.f gettok.f gnbtok.f
--$F77 -c $HSI_FF gocode.f gtok.f ifcode.f iferrc.f ifgo.f ifparm.f
--$F77 -c $HSI_FF indent.f initkw.f labelc.f labgen.f lex.f litral.f
--$F77 -c $HSI_FF lndict.f ludef.f mapid.f ngetch.f ogotos.f otherc.f
--$F77 -c $HSI_FF outch.f outcon.f outdon.f outdwe.f outgo.f outnum.f
--$F77 -c $HSI_FF outstr.f outtab.f parse.f pbnum.f pbstr.f poicod.f
--$F77 -c $HSI_FF push.f putbak.f putchr.f puttok.f ratfor.f relate.f
--$F77 -c $HSI_FF repcod.f retcod.f sdupl.f skpblk.f squash.f strdcl.f
--$F77 -c $HSI_FF swcode.f swend.f swvar.f synerr.f thenco.f ulstal.f
--$F77 -c $HSI_FF uniqid.f unstak.f untils.f whilec.f whiles.f
-+$F77 $FFLAGS -c $HSI_FF addchr.f allblk.f alldig.f baderr.f balpar.f beginc.f
-+$F77 $FFLAGS -c $HSI_FF brknxt.f cascod.f caslab.f declco.f deftok.f doarth.f
-+$F77 $FFLAGS -c $HSI_FF docode.f doif.f doincr.f domac.f dostat.f dosub.f
-+$F77 $FFLAGS -c $HSI_FF eatup.f elseif.f endcod.f entdef.f entdkw.f entfkw.f
-+$F77 $FFLAGS -c $HSI_FF entrkw.f entxkw.f errchk.f errgo.f errorc.f evalr.f
-+$F77 $FFLAGS -c $HSI_FF finit.f forcod.f fors.f getdef.f gettok.f gnbtok.f
-+$F77 $FFLAGS -c $HSI_FF gocode.f gtok.f ifcode.f iferrc.f ifgo.f ifparm.f
-+$F77 $FFLAGS -c $HSI_FF indent.f initkw.f labelc.f labgen.f lex.f litral.f
-+$F77 $FFLAGS -c $HSI_FF lndict.f ludef.f mapid.f ngetch.f ogotos.f otherc.f
-+$F77 $FFLAGS -c $HSI_FF outch.f outcon.f outdon.f outdwe.f outgo.f outnum.f
-+$F77 $FFLAGS -c $HSI_FF outstr.f outtab.f parse.f pbnum.f pbstr.f poicod.f
-+$F77 $FFLAGS -c $HSI_FF push.f putbak.f putchr.f puttok.f ratfor.f relate.f
-+$F77 $FFLAGS -c $HSI_FF repcod.f retcod.f sdupl.f skpblk.f squash.f strdcl.f
-+$F77 $FFLAGS -c $HSI_FF swcode.f swend.f swvar.f synerr.f thenco.f ulstal.f
-+$F77 $FFLAGS -c $HSI_FF uniqid.f unstak.f untils.f whilec.f whiles.f
-
- ar rv librpp.a *.o
- $RANLIB librpp.a
---- a/unix/boot/spp/xpp/mkpkg.sh
-+++ b/unix/boot/spp/xpp/mkpkg.sh
-@@ -2,14 +2,14 @@
-
- find xpp.l -newer lexyy.c -exec rm lexyy.c \;
- if test -f lexyy.c; then\
-- $CC -c $HSI_CF lexyy.c;\
-+ $CC $CFLAGS -c $HSI_CF lexyy.c;\
- else\
- lex xpp.l;\
- sed -f lex.sed lex.yy.c > lexyy.c; rm lex.yy.c;\
-- $CC -c $HSI_CF lexyy.c;\
-+ $CC $CFLAGS -c $HSI_CF lexyy.c;\
- fi
-
--$CC -c $HSI_CF xppmain.c xppcode.c decl.c
--$CC $HSI_LF xppmain.o lexyy.o xppcode.o decl.o $HSI_LIBS -o xpp.e
-+$CC $CFLAGS -c $HSI_CF xppmain.c xppcode.c decl.c
-+$CC $CFLAGS $HSI_LF xppmain.o lexyy.o xppcode.o decl.o $HSI_LIBS -o xpp.e
- mv -f xpp.e ../../../hlib
- rm *.o
---- a/unix/boot/wtar/mkpkg.sh
-+++ b/unix/boot/wtar/mkpkg.sh
-@@ -1,6 +1,6 @@
- # Bootstrap WTAR.
-
--$CC -c $HSI_CF wtar.c
--$CC $HSI_LF wtar.o $HSI_LIBS -o wtar.e
-+$CC $CFLAGS -c $HSI_CF wtar.c
-+$CC $CFLAGS $HSI_LF wtar.o $HSI_LIBS -o wtar.e
- mv wtar.e ../../hlib
- rm -f wtar.o
---- a/unix/boot/xyacc/mkpkg.sh
-+++ b/unix/boot/xyacc/mkpkg.sh
-@@ -1,7 +1,7 @@
- # XYACC -- Yacc parser generator for SPP.
-
--$CC -c $HSI_CF y[1-4].c
--$CC $HSI_LF y[1-4].o -o xyacc.e
-+$CC $CFLAGS -c $HSI_CF y[1-4].c
-+$CC $CFLAGS $HSI_LF y[1-4].o -o xyacc.e
- mv -f xyacc.e ../../hlib
- cp yaccpar.x ../../../lib
- rm -f *.o
---- a/unix/os/mkpkg.sh
-+++ b/unix/os/mkpkg.sh
-@@ -3,8 +3,8 @@
- echo "--------------------- OS ----------------------"
-
-
--$CC -c $HSI_CF -Wall alloc.c getproc.c
--$CC $HSI_LF -Wall alloc.o getproc.o $HSI_OSLIBS -o alloc.e
-+$CC $CFLAGS -c $HSI_CF alloc.c getproc.c
-+$CC $CFLAGS $HSI_LF alloc.o getproc.o $HSI_OSLIBS -o alloc.e
- chmod 4755 alloc.e
- mv -f alloc.e ../hlib
- rm -f alloc.o
-@@ -12,13 +12,13 @@
-
- if test "$IRAFARCH" != "macosx"; then
- for i in zsvjmp ;\
-- do $CC -c $HSI_CF -Wall ../as/$i.s -o $i.o ;\
-+ do $CC $CFLAGS -c $HSI_CF ../as/$i.s -o $i.o ;\
- done
- fi
-
-
- for i in gmttolst.c irafpath.c prwait.c z*.c ;\
-- do $CC -c $HSI_CF -Wall $i ;\
-+ do $CC $CFLAGS -c $HSI_CF $i ;\
- done
-
- #ar rv libos.a *.o; ar dv libos.a zmain.o; rm *.o
--- a/vendor/Makefile
+++ b/vendor/Makefile
@@ -29,7 +29,7 @@
@@ -487,102 +226,3 @@
Shared:
/bin/mkdir $@
chmod 777 $@
---- a/unix/gdev/sgidev/mkpkg.sh
-+++ b/unix/gdev/sgidev/mkpkg.sh
-@@ -1,56 +1,56 @@
- # Make the SGI translators and install them in hlib.
-
--$CC -c $HSI_CF sgidispatch.c
--$CC $HSI_LF sgidispatch.o $HSI_LIBS -o sgidispatch.e
-+$CC $CFLAGS -c $HSI_CF sgidispatch.c
-+$CC $CFLAGS $HSI_LF sgidispatch.o $HSI_LIBS -o sgidispatch.e
- mv -f sgidispatch.e ../../hlib
- rm sgidispatch.o
-
--$CC -c $HSI_CF sgi2uimp.c
--$CC $HSI_LF sgi2uimp.o $HSI_LIBS -o sgi2uimp.e
-+$CC $CFLAGS -c $HSI_CF sgi2uimp.c
-+$CC $CFLAGS $HSI_LF sgi2uimp.o $HSI_LIBS -o sgi2uimp.e
- mv -f sgi2uimp.e ../../hlib
- rm sgi2uimp.o
-
--$CC -c $HSI_CF sgi2uapl.c
--$CC $HSI_LF sgi2uapl.o $HSI_LIBS -o sgi2uapl.e
-+$CC $CFLAGS -c $HSI_CF sgi2uapl.c
-+$CC $CFLAGS $HSI_LF sgi2uapl.o $HSI_LIBS -o sgi2uapl.e
- mv -f sgi2uapl.e ../../hlib
- rm sgi2uapl.o
-
--$CC -c $HSI_CF sgi2uqms.c
--$CC $HSI_LF sgi2uqms.o $HSI_LIBS -o sgi2uqms.e
-+$CC $CFLAGS -c $HSI_CF sgi2uqms.c
-+$CC $CFLAGS $HSI_LF sgi2uqms.o $HSI_LIBS -o sgi2uqms.e
- mv -f sgi2uqms.e ../../hlib
- rm sgi2uqms.o
-
--$CC -c $HSI_CF sgi2uptx.c
--$CC $HSI_LF sgi2uptx.o $HSI_LIBS -o sgi2uptx.e
-+$CC $CFLAGS -c $HSI_CF sgi2uptx.c
-+$CC $CFLAGS $HSI_LF sgi2uptx.o $HSI_LIBS -o sgi2uptx.e
- mv -f sgi2uptx.e ../../hlib
- rm sgi2uptx.o
-
--$CC -c $HSI_CF sgi2uhplj.c
--$CC $HSI_LF sgi2uhplj.o $HSI_LIBS -o sgi2uhplj.e
-+$CC $CFLAGS -c $HSI_CF sgi2uhplj.c
-+$CC $CFLAGS $HSI_LF sgi2uhplj.o $HSI_LIBS -o sgi2uhplj.e
- mv -f sgi2uhplj.e ../../hlib
- rm sgi2uhplj.o
-
--$CC -c $HSI_CF sgi2uhpgl.c
--$CC $HSI_LF sgi2uhpgl.o $HSI_LIBS -o sgi2uhpgl.e
-+$CC $CFLAGS -c $HSI_CF sgi2uhpgl.c
-+$CC $CFLAGS $HSI_LF sgi2uhpgl.o $HSI_LIBS -o sgi2uhpgl.e
- mv -f sgi2uhpgl.e ../../hlib
- rm sgi2uhpgl.o
-
--$CC -c $HSI_CF sgi2ueps.c
--$CC $HSI_LF sgi2ueps.o $HSI_LIBS -o sgi2ueps.e
-+$CC $CFLAGS -c $HSI_CF sgi2ueps.c
-+$CC $CFLAGS $HSI_LF sgi2ueps.o $HSI_LIBS -o sgi2ueps.e
- mv -f sgi2ueps.e ../../hlib
- rm sgi2ueps.o
-
--$CC -c $HSI_CF sgi2gif.c
--$CC $HSI_LF sgi2gif.o $HSI_LIBS -o sgi2gif.e
-+$CC $CFLAGS -c $HSI_CF sgi2gif.c
-+$CC $CFLAGS $HSI_LF sgi2gif.o $HSI_LIBS -o sgi2gif.e
- mv -f sgi2gif.e ../../hlib
- rm sgi2gif.o
-
--$CC -c $HSI_CF sgi2xbm.c
--$CC $HSI_LF sgi2xbm.o $HSI_LIBS -o sgi2xbm.e
-+$CC $CFLAGS -c $HSI_CF sgi2xbm.c
-+$CC $CFLAGS $HSI_LF sgi2xbm.o $HSI_LIBS -o sgi2xbm.e
- mv -f sgi2xbm.e ../../hlib
- rm sgi2xbm.o
-
--$CC -c $HSI_CF sgi2svg.c
--$CC $HSI_LF sgi2svg.o $HSI_LIBS -o sgi2svg.e
-+$CC $CFLAGS -c $HSI_CF sgi2svg.c
-+$CC $CFLAGS $HSI_LF sgi2svg.o $HSI_LIBS -o sgi2svg.e
- mv -f sgi2svg.e ../../hlib
- rm sgi2svg.o
---- a/unix/shlib/mkpkg.sh
-+++ b/unix/shlib/mkpkg.sh
-@@ -2,11 +2,11 @@
-
- echo "make edsym.e"
- if [ $OSVERSION = 4 ] ; then
--$CC -c $HSI_CF edsym-sos4.c
--$CC $HSI_LFLAGS edsym-sos4.o $HSI_LIBS -o edsym.e ;
-+$CC $CFLAGS -c $HSI_CF edsym-sos4.c
-+$CC $CFLAGS $HSI_LFLAGS edsym-sos4.o $HSI_LIBS -o edsym.e ;
- else
--$CC -c $HSI_CF edsym-ssol.c
--$CC $HSI_LFLAGS edsym-ssol.o $HSI_LIBS -o edsym.e ;
-+$CC $CFLAGS -c $HSI_CF edsym-ssol.c
-+$CC $CFLAGS $HSI_LFLAGS edsym-ssol.o $HSI_LIBS -o edsym.e ;
- fi
- mv -f edsym.e ../hlib
- rm -f edsym.o
diff --git a/debian/patches/fix_compiler_errors.patch b/debian/patches/fix_compiler_errors.patch
new file mode 100644
index 0000000..e6fa0b4
--- /dev/null
+++ b/debian/patches/fix_compiler_errors.patch
@@ -0,0 +1,24 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Fix compiler errors that appear when compiled with Debian CFLAGS
+--- a/unix/boot/spp/xpp/xppcode.c
++++ b/unix/boot/spp/xpp/xppcode.c
+@@ -690,7 +690,7 @@
+ } else {
+ /* UNREACHABLE when in declarations section of a procedure.
+ */
+- fprintf (yyout, type_decl[type]);
++ fprintf (yyout, "%s", type_decl[type]);
+ }
+ }
+
+--- a/unix/os/zfioks.c
++++ b/unix/os/zfioks.c
+@@ -1391,7 +1391,7 @@
+ int pid;
+ if (debug_ks) {
+ fprintf (debug_fp, "[%5d] ", (pid = getpid())); dbgsp(pid);
+- fprintf (debug_fp, msg);
++ fprintf (debug_fp, "%s", msg);
+ }
+ }
+ static void
diff --git a/debian/patches/irafuser_csh.patch b/debian/patches/irafuser_csh.patch
index 6ad3984..f51c670 100644
--- a/debian/patches/irafuser_csh.patch
+++ b/debian/patches/irafuser_csh.patch
@@ -71,7 +71,7 @@
setenv RANLIB ranlib
switch ($MACH)
-@@ -122,10 +71,14 @@
+@@ -122,25 +71,29 @@
set mkzflags = "'lflags=-z'"
breaksw
@@ -81,25 +81,36 @@
- setenv HSI_CF "-g -DLINUX -DREDHAT -DPOSIX -DSYSV -DLINUX64 -DMACH64 -w -m64"
- setenv HSI_XF "-g -Inolibc -w -/m64 -/Wunused"
- setenv HSI_FF "-g -m64 -DBLD_KERNEL"
-+ setenv XC_CFLAGS "-I${iraf}unix/f2c"
-+ setenv XC_FFLAGS "-I${iraf}unix/f2c"
-+ setenv HSI_CF "-I${iraf}unix/f2c -g -O2 -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -DLINUX64 -DMACH64 -w -m64 -DNOLIBCNAMES -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_CFITSIO"
-+ setenv HSI_XF "-I${iraf}unix/f2c -g -Inolibc -I${hlib}libc -w -/m64 -/Wunused"
-+ setenv HSI_FF "-I${iraf}unix/f2c -g -m64 -DBLD_KERNEL"
- setenv HSI_LF "-m64 "
+- setenv HSI_LF "-m64 "
++ setenv XC_CFLAGS "${CFLAGS} -I${iraf}unix/f2c"
++ setenv XC_FFLAGS "${FFLAGS} -I${iraf}unix/f2c"
++ setenv HSI_CF "${CFLAGS} -I${iraf}unix/f2c -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -DLINUX64 -DMACH64 -DNOLIBCNAMES -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_CFITSIO"
++ setenv HSI_XF "-I${iraf}unix/f2c -g -Inolibc -I${hlib}libc -w -/Wunused"
++ setenv HSI_FF "${FFLAGS} -I${iraf}unix/f2c -DBLD_KERNEL"
++ setenv HSI_LF "${LDFLAGS} "
setenv HSI_F77LIBS ""
- setenv HSI_LFLAGS ""
-@@ -135,8 +88,8 @@
+- setenv HSI_LFLAGS ""
++ setenv HSI_LFLAGS "${LDFLAGS} "
+ setenv HSI_OSLIBS ""
+ set mkzflags = "'lflags=-Nxz -/Wl,-Bstatic'"
+ breaksw
case linux:
case redhat:
- setenv HSI_CF "-O -DLINUX -DREDHAT -DPOSIX -DSYSV -w -m32 -Wunused"
- setenv HSI_XF "-Inolibc -w -/Wunused -/m32"
-+ setenv HSI_CF "-g -O2 -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -w -m32 -Wunused -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_XMLRPC -DHOST_CFITSIO"
-+ setenv HSI_XF "-Inolibc -I${hlib}libc -w -/Wunused -/m32"
- setenv HSI_FF "-O -DBLD_KERNEL -m32"
- setenv HSI_LF "-m32"
+- setenv HSI_FF "-O -DBLD_KERNEL -m32"
+- setenv HSI_LF "-m32"
++ setenv HSI_CF "${CFLAGS} -I/usr/include -I${hlib}libc -DLINUX -DREDHAT -DPOSIX -DSYSV -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_XMLRPC -DHOST_CFITSIO"
++ setenv HSI_XF "-Inolibc -I${hlib}libc -w -/Wunused"
++ setenv HSI_FF "${FFLAGS} -DBLD_KERNEL"
++ setenv HSI_LF "${LDFLAGS} "
setenv HSI_F77LIBS ""
+- setenv HSI_LFLAGS ""
++ setenv HSI_LFLAGS "${LDFLAGS} "
+ setenv HSI_OSLIBS ""
+ set mkzflags = "'lflags=-Nxz -/Wl,-Bstatic'"
+ breaksw
@@ -191,10 +144,10 @@
# The following determines whether or not the VOS is used for filename mapping.
if (-f ${iraf}lib/libsys.a) then
diff --git a/debian/patches/series b/debian/patches/series
index b36b973..6ead842 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ xc.patch
shared-xmlrpc.patch
remove-absolute-path.patch
cflags.patch
+fix_compiler_errors.patch
diff --git a/debian/rules b/debian/rules
index c7d0ecb..4414934 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,6 @@ export HOST_READLINE=1
export HOST_EXPAT=1
export HOST_CFITSIO=1
export IRAFARCH=$(shell ${hlib}irafarch.csh)
-export XC_CFLAGS=${CFLAGS}
-export XC_FFLAGS=${FFLAGS}
-export XC_LFLAGS=${LDFLAGS}
%:
dh $@
@@ -45,12 +42,15 @@ libvo: sysnovos
make -C vendor/voclient clean mylib
cp vendor/voclient/libvo/libVO.a ${iraf}lib
-override_dh_auto_build: libvo
+override_dh_auto_build-arch: libvo
chmod a+x util/mksysvos
pkglibs=${iraf}noao/lib/,${host}bin/,${hlib}/libc/ \
csh -f ${iraf}util/mksysvos
+override_dh_auto_build: override_dh_auto_build-arch
+
override_dh_auto_build-indep:
+ # Nothing to do
override_dh_auto_install-indep:
for f in $(shell find . -name \*.hlp \
--
Image Reduction and Analysis Facility
More information about the debian-science-commits
mailing list