[SCM] Image Reduction and Analysis Facility branch, debian, updated. 4c2580bfd7bb9bf8ba14f2f3988f39f9db8421f7
Ole Streicher
debian at liska.ath.cx
Tue Jun 11 14:21:19 UTC 2013
The following commit has been merged in the debian branch:
commit 4c2580bfd7bb9bf8ba14f2f3988f39f9db8421f7
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Jun 11 16:19:34 2013 +0200
Build libf2c only on x86 archs
diff --git a/debian/rules b/debian/rules
index 8dd99c5..13060d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export iraf=$(shell pwd)/
export iraf_b=${iraf}
export host=${iraf}unix/
export hlib=${host}hlib/
-export pkglibs=${iraf}noao/lib/,${hlib}/libc/,${host}bin/
+export pkglibs=${iraf}noao/lib/,${hlib}libc/,${host}bin/
export PATH := ${PATH}:${host}bin/:${hlib}bin/
export HOST_CURL=1
export HOST_READLINE=1
@@ -22,13 +22,15 @@ export CC=gcc
tmp_links:
ln -sf bin.${IRAFARCH} bin
ln -sf bin.${IRAFARCH} noao/bin
- ln -sf mach`getconf LONG_BIT`.h ${hlib}/mach.h
- ln -sf iraf`getconf LONG_BIT`.h ${hlib}/iraf.h
+ ln -sf mach`getconf LONG_BIT`.h ${hlib}mach.h
+ ln -sf iraf`getconf LONG_BIT`.h ${hlib}iraf.h
override_dh_auto_configure: tmp_links
libf2c:
- make -C ${host}f2c/libf2c -f makefile.u
+ if [ `getconf LONG_BIT` = 64 ] ; then \
+ make -C ${host}f2c/libf2c -f makefile.u ; \
+ fi
libvo_novos: libf2c
make src
@@ -47,7 +49,7 @@ libvo: sysnovos
override_dh_auto_build-arch: libvo
chmod a+x util/mksysvos
- pkglibs=${iraf}noao/lib/,${host}bin/,${hlib}/libc/ \
+ pkglibs=${iraf}noao/lib/,${host}bin/,${hlib}libc/ \
csh -f ${iraf}util/mksysvos
override_dh_auto_build: override_dh_auto_build-arch
--
Image Reduction and Analysis Facility
More information about the debian-science-commits
mailing list