[SCM] Image Reduction and Analysis Facility branch, debian, updated. 2ed5153522c1f923da70822b59c44e6544884252
Ole Streicher
debian at liska.ath.cx
Sun Jun 2 22:15:19 UTC 2013
The following commit has been merged in the debian branch:
commit 8db792e98a92795084f4cc5f6425b94a759ea643
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Jun 3 00:12:15 2013 +0200
Propagate CFLAGS
diff --git a/debian/patches/cflags.patch b/debian/patches/cflags.patch
new file mode 100644
index 0000000..d9af333
--- /dev/null
+++ b/debian/patches/cflags.patch
@@ -0,0 +1,588 @@
+--- a/vendor/voclient/libsamp/libxrpc/Makefile
++++ b/vendor/voclient/libsamp/libxrpc/Makefile
+@@ -26,7 +26,7 @@
+ # includes, flags and libraries
+ CINCS = -I./ -I./include -I../include -Ixmlrpc-c/lib/abyss/src
+ #CFLAGS = -O2 -m32 -g $(CINCS)
+-CFLAGS = -g -Wall $(CINCS)
++CFLAGS := $(CFLAGS) $(CINCS)
+
+
+ # list of source and include files
+@@ -73,7 +73,7 @@
+ cp -rp $(INCS) ./include/x* ../../include
+
+ %.o: %.c $(INCS)
+- /usr/bin/gcc -Wall $(CINCS) $(CFLAGS) -c $< -o $@
++ $(CC) -Wall $(CINCS) $(CFLAGS) -c $< -o $@
+
+
+ #=======================
+@@ -83,7 +83,7 @@
+ $(STATICLIB): $(SRCS:%.c=Static/%.o)
+ /usr/bin/ar rv $@ $?
+ Static/%.o: %.c $(INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -c $< -o $@
+ Static:
+ /bin/mkdir $@
+ chmod 777 $@
+@@ -91,7 +91,7 @@
+ $(SHAREDLIB): $(SRCS:%.c=Shared/%.o)
+ /usr/bin/ld -shared -o $@ $? -lc -ldl
+ Shared/%.o: %.c $(INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
+ Shared:
+ /bin/mkdir $@
+ chmod 777 $@
+--- a/vendor/voclient/libvoclient/Makefile
++++ b/vendor/voclient/libvoclient/Makefile
+@@ -35,7 +35,6 @@
+ CINCS = -I$(HERE)
+ #CFLAGS = -O2 -DDEBUG -D$(PLATFORM)
+ #CFLAGS = -arch i386 -arch ppc -g -Wall -D$(PLATFORM)
+-CFLAGS = -g -Wall -D$(PLATFORM)
+
+
+ # list of source and include files
+--- a/vendor/voclient/libsamp/cfitsio/Makefile
++++ b/vendor/voclient/libsamp/cfitsio/Makefile
+@@ -30,9 +30,9 @@
+ SHELL = /bin/sh
+ RANLIB = ranlib
+ CC = gcc
+-CFLAGS = -g -O2 -Dg77Fortran -fPIC -fno-common
++CFLAGS := $(CFLAGS) -Dg77Fortran -fPIC -fno-common
+ FC = gfortran
+-LDFLAGS = $(CFLAGS)
++#LDFLAGS = $(CFLAGS)
+ DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MATH_H=1 -DHAVE_LIMITS_H=1 -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DHAVE_FTRUNCATE=1 -DHAVE_LONGLONG=1 -DHAVE_SHMEM_SERVICES=1 -DHAVE_UNION_SEMUN=1 -DHAVE_NET_SERVICES=1
+ LIBS =
+ FLEX = flex
+--- a/vendor/voclient/libvotable/Makefile
++++ b/vendor/voclient/libvotable/Makefile
+@@ -35,7 +35,7 @@
+ CARCH =
+ endif
+
+-CFLAGS = -g -Wall $(CARCH) -D$(PLATFORM) $(CINCS) -L./ -DHAVE_CFITSIO
++CFLAGS := $(CFLAGS) -DHAVE_CFITSIO
+ CLIBS = -lm -lc -lpthread -lcfitsio
+
+
+@@ -205,7 +205,7 @@
+ $(STATICLIB): $(SRCS:%.c=Static/%.o)
+ /usr/bin/ar rv $@ $?
+ Static/%.o: %.c $(INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -c $< -o $@
+ Static/%.o: %.x $(SPP_INCS)
+ xc -c $< -o $@
+ Static:
+@@ -215,7 +215,7 @@
+ $(SHAREDLIB): $(SRCS:%.c=Shared/%.o)
+ /usr/bin/ld -shared -o $@ $? -lc -ldl
+ Shared/%.o: %.c $(INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
+ Shared:
+ /bin/mkdir $@
+ chmod 777 $@
+--- a/vendor/voclient/voapps/Makefile
++++ b/vendor/voclient/voapps/Makefile
+@@ -43,7 +43,7 @@
+ endif
+
+ CLIBS = -lm -lc -lcurl -lpthread -lm
+-CFLAGS = -g -Wall $(CARCH) -D$(PLATFORM) $(CINCS) -L./
++CFLAGS := $(CFLAGS) $(CARCH) -D$(PLATFORM) $(CINCS) -L./
+
+
+
+@@ -54,7 +54,7 @@
+
+ #F77 = g77
+ F77 = gfortran
+-FFLAGS = -g -Wall
++#FFLAGS = -g -Wall
+
+
+ # list of source and include files
+@@ -198,7 +198,7 @@
+ $(STATICLIB): $(C_SRCS:%.c=Static/%.o)
+ /usr/bin/ar rv $@ $?
+ Static/%.o: %.c $(C_INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -c $< -o $@
+ Static:
+ /bin/mkdir $@
+ chmod 777 $@
+@@ -206,7 +206,7 @@
+ $(SHAREDLIB): $(C_SRCS:%.c=Shared/%.o)
+ /usr/bin/ld -shared -o $@ $? -lc -ldl
+ Shared/%.o: %.c $(C_INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
+ 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 @@
+ CARCH =
+ endif
+
+-CFLAGS = -g -Wall $(CARCH) -D$(PLATFORM) $(CINCS) -L./
++CFLAGS := $(CFLAGS) $(CARCH) -D$(PLATFORM) $(CINCS) -L./
+ LIBS = -lm -lc -lpthread
+
+
+@@ -61,7 +61,7 @@
+ $(STATICLIB): $(SRCS:%.c=Static/%.o)
+ /usr/bin/ar rv $@ $?
+ Static/%.o: %.c $(INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -c $< -o $@
+ Static:
+ /bin/mkdir $@
+ chmod 777 $@
+@@ -69,7 +69,7 @@
+ $(SHAREDLIB): $(SRCS:%.c=Shared/%.o)
+ /usr/bin/ld -shared -o $@ $? -lc -ldl
+ Shared/%.o: %.c $(INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
+ Shared:
+ /bin/mkdir $@
+ chmod 777 $@
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@
+ # Compiler Flags.
+
+ RELEASE = v2.16
+-CFLAGS =
++#CFLAGS =
+ CDEBUGFLAGS = -O2 -Wall
+ BOOTSTRAPCFLAGS =
+
+--- a/vendor/voclient/Makefile
++++ b/vendor/voclient/Makefile
+@@ -32,7 +32,6 @@
+ CARCH =
+ endif
+
+-CFLAGS = -g -Wall $(CARCH) -D$(PLATFORM) $(CINCS) -L./
+ LIBS = -lm -lc -lpthread
+
+
+@@ -100,7 +99,7 @@
+ $(STATICLIB): $(SRCS:%.c=Static/%.o)
+ /usr/bin/ar rv $@ $?
+ Static/%.o: %.c $(INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -c $< -o $@
+ Static:
+ /bin/mkdir $@
+ chmod 777 $@
+@@ -108,7 +107,7 @@
+ $(SHAREDLIB): $(SRCS:%.c=Shared/%.o)
+ /usr/bin/ld -shared -o $@ $? -lc -ldl
+ Shared/%.o: %.c $(INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
+ Shared:
+ /bin/mkdir $@
+ chmod 777 $@
+--- a/vendor/voclient/libsamp/Makefile
++++ b/vendor/voclient/libsamp/Makefile
+@@ -40,7 +40,7 @@
+ endif
+
+ CLIBS = -lm -lc -lcurl -lpthread
+-CFLAGS = -g -Wall $(CARCH) -D$(PLATFORM) $(CINCS) -L./
++CFLAGS := $(CFLAGS) $(CINCS)
+
+
+
+@@ -203,7 +203,7 @@
+ $(STATICLIB): $(SRCS:%.c=Static/%.o)
+ /usr/bin/ar r $@ $?
+ Static/%.o: %.c $(INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -c $< -o $@
+ Static:
+ /bin/mkdir $@
+ chmod 777 $@
+@@ -211,7 +211,7 @@
+ $(SHAREDLIB): $(SRCS:%.c=Shared/%.o)
+ /usr/bin/ld -shared -o $@ $? -lc -ldl
+ Shared/%.o: %.c $(INCS)
+- /usr/bin/gcc $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
++ $(CC) $(CINCS) $(CFLAGS) -fpic -shared -c $< -o $@
+ 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/series b/debian/patches/series
index 6b91997..b36b973 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ vodata.patch
xc.patch
shared-xmlrpc.patch
remove-absolute-path.patch
+cflags.patch
diff --git a/debian/rules b/debian/rules
index c0fca17..bd7ad43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,9 @@ 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 $@
@@ -63,9 +66,9 @@ override_dh_auto_install-indep:
fgrep -v ./dev/tapecap. | \
cut -c3-) ; do \
install -p -D -m 644 $$f debian/tmp/usr/share/iraf/$$f ; \
-# This is for Ubuntu
touch debian/tmp/usr/share/iraf/$$f ; \
done
+# The "touch" is for Ubuntu
override_dh_auto_clean:
rm -rf vo/votools/.old
--
Image Reduction and Analysis Facility
More information about the debian-science-commits
mailing list