[SCM] Image Reduction and Analysis Facility branch, debian, updated. 9b43832062a7300f2fa91ae5e4bcc79ef15dea8c

Ole Streicher debian at liska.ath.cx
Sat Jun 8 16:53:33 UTC 2013


The following commit has been merged in the debian branch:
commit 1023f14727405edb76035f64624c1eff31dd6eab
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Jun 8 16:27:25 2013 +0200

    Remove -DREDHAT to fix i386 FTBS

diff --git a/debian/patches/irafuser_csh.patch b/debian/patches/irafuser_csh.patch
index f51c670..5bfd804 100644
--- a/debian/patches/irafuser_csh.patch
+++ b/debian/patches/irafuser_csh.patch
@@ -84,7 +84,7 @@
 -    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_CF "${CFLAGS} -I${iraf}unix/f2c -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 -g -Inolibc -I${hlib}libc -w -/Wunused"
 +    setenv HSI_FF "${FFLAGS} -I${iraf}unix/f2c -DBLD_KERNEL"
 +    setenv HSI_LF "${LDFLAGS} "
@@ -101,7 +101,7 @@
 -    setenv HSI_XF "-Inolibc -w -/Wunused -/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_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} "

-- 
Image Reduction and Analysis Facility



More information about the debian-science-commits mailing list