[SCM] Image Reduction and Analysis Facility branch, debian, updated. 36fcb1f581d974d5f65ade28cc51485ec2b07dda

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 36fcb1f581d974d5f65ade28cc51485ec2b07dda
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 10 22:59:36 2013 +0200

    Use local libf2c on linux64

diff --git a/debian/patches/compiler-flags.patch b/debian/patches/compiler-flags.patch
index 344f335..f3a9521 100644
--- a/debian/patches/compiler-flags.patch
+++ b/debian/patches/compiler-flags.patch
@@ -133,14 +133,16 @@ Description: Propagate compiler flags CFLAGS and CC to Makefiles.
  	chmod 777 $@
 --- a/vendor/Makefile
 +++ b/vendor/Makefile
-@@ -17,7 +17,6 @@
+@@ -17,8 +17,7 @@
  
  
  # includes, flags and libraries
 -CC 	  	= gcc
- CINCS  	  	= -I$(INCDIR) -I./
+-CINCS  	  	= -I$(INCDIR) -I./
++CINCS  	  	= -I$(INCDIR) -I./ -I${host}f2c/libf2c
  ifeq  ($(PLATFORM), "Darwin")
      ifeq  ($(PLATFORM), "x86_64")
+         CARCH	= -m64 -mmacosx-version-min=10.5
 @@ -29,7 +28,7 @@
      CARCH	= 
  endif
diff --git a/debian/patches/irafuser_csh.patch b/debian/patches/irafuser_csh.patch
index 3c114cc..e89dc68 100644
--- a/debian/patches/irafuser_csh.patch
+++ b/debian/patches/irafuser_csh.patch
@@ -71,26 +71,24 @@
  setenv	RANLIB	ranlib
  
  switch ($MACH)
-@@ -122,25 +71,29 @@
-     set    mkzflags = "'lflags=-z'"
+@@ -123,24 +72,27 @@
      breaksw
  
-+# Add ${iraf}unix/f2c to include since f2c on fedora has a different
-+# set of include definitions
  case linux64:
 -    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 HSI_LF "-m64 "
-+    setenv XC_CFLAGS "${CFLAGS} -I${iraf}unix/f2c/libf2c"
-+    setenv XC_FFLAGS "${FFLAGS} -I${iraf}unix/f2c/libf2c"
-+    setenv HSI_CF "${CFLAGS} -I${iraf}unix/f2c/libf2c -I/usr/include -I${hlib}libc -DLINUX -DPOSIX -DSYSV -DLINUX64 -DMACH64 -DNOLIBCNAMES -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_CFITSIO"
-+    setenv HSI_XF "-I${iraf}unix/f2c/libf2c -g -Inolibc -I${hlib}libc -w -/Wunused"
-+    setenv HSI_FF "${FFLAGS} -I${iraf}unix/f2c/libf2c -DBLD_KERNEL"
-+    setenv HSI_LF "${LDFLAGS} "
++    setenv XC_CFLAGS "${CFLAGS} -I${host}f2c/libf2c"
++    setenv XC_FFLAGS "${FFLAGS} -I${host}f2c/libf2c"
++    setenv XC_LFLAGS "${FFLAGS} -L${host}f2c/libf2c"
++    setenv HSI_CF "${CFLAGS} -I${host}f2c/libf2c -I/usr/include -I${hlib}libc -DLINUX -DPOSIX -DSYSV -DLINUX64 -DMACH64 -DNOLIBCNAMES -DHOST_F2C -DHOST_CURL -DHOST_EXPAT -DHOST_CFITSIO"
++    setenv HSI_XF "-I${host}f2c/libf2c -g -Inolibc -I${hlib}libc -w -/Wunused"
++    setenv HSI_FF "${FFLAGS} -I${host}f2c/libf2c -DBLD_KERNEL"
++    setenv HSI_LF "${LDFLAGS} -L${host}f2c/libf2c"
      setenv HSI_F77LIBS ""
 -    setenv HSI_LFLAGS ""
-+    setenv HSI_LFLAGS "${LDFLAGS} "
++    setenv HSI_LFLAGS "${LDFLAGS}  -L${host}f2c/libf2c"
      setenv HSI_OSLIBS ""
      set    mkzflags = "'lflags=-Nxz -/Wl,-Bstatic'"
      breaksw
@@ -104,19 +102,31 @@
 +    setenv HSI_CF "${CFLAGS} -I/usr/include -I${hlib}libc -DLINUX -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_LF "${LDFLAGS}"
      setenv HSI_F77LIBS ""
 -    setenv HSI_LFLAGS ""
-+    setenv HSI_LFLAGS "${LDFLAGS} "
++    setenv HSI_LFLAGS "${LDFLAGS}"
      setenv HSI_OSLIBS ""
      set    mkzflags = "'lflags=-Nxz -/Wl,-Bstatic'"
      breaksw
-@@ -191,10 +144,10 @@
+@@ -179,22 +131,13 @@
+ endsw
+ 
+ 
+-# Prepend a user <iraf.h> file to the compile flags in case we don't
+-# install as root.
+-#
+-setenv HSI_CF  "-I${HOME}/.iraf/ $HSI_CF"
+-setenv HSI_FF  "-I${HOME}/.iraf/ $HSI_FF"
+-setenv HSI_LF  "-I${HOME}/.iraf/ $HSI_LF"
+-setenv HSI_XF  "-I${HOME}/.iraf/ $HSI_XF"
+-
+-
  # The following determines whether or not the VOS is used for filename mapping.
  if (-f ${iraf}lib/libsys.a) then
  	setenv	HSI_LIBS\
 -    "${hlib}libboot.a ${iraf}lib/libsys.a ${iraf}lib/libvops.a ${hlib}libos.a ${hbin}libf2c.a -lm"
-+    "${hbin}libboot.a ${iraf}lib/libsys.a ${iraf}lib/libvops.a -lf2c ${hbin}libos.a"
++    "${hbin}libboot.a ${iraf}lib/libsys.a ${iraf}lib/libvops.a -lf2c -lm ${hbin}libos.a"
  else
  	setenv	HSI_CF "$HSI_CF -DNOVOS"
 -	setenv	HSI_LIBS "${hlib}libboot.a ${hlib}libos.a"
diff --git a/debian/patches/voclient.patch b/debian/patches/voclient.patch
index cf06080..f0c193a 100644
--- a/debian/patches/voclient.patch
+++ b/debian/patches/voclient.patch
@@ -201,6 +201,15 @@
  	touch .BASE
  
  lib: objs
+@@ -105,7 +108,7 @@
+ ###############################################################################
+ 
+ votUtil_spp.o: votUtil_spp.x votParse_spp.h
+-	xc -c votUtil_spp.x
++	xc -I${host}f2c/libf2c -c votUtil_spp.x
+ 
+ 
+ ###############################################################################
 --- a/vendor/voclient/libvotable/votParse.c
 +++ b/vendor/voclient/libvotable/votParse.c
 @@ -18,7 +18,6 @@

-- 
Image Reduction and Analysis Facility