Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29009
Modified Files:
gildas.info gildas.patch
Log Message:
Add x86_64 arch.
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gildas.patch 4 Nov 2009 14:20:05 -0000 1.12
+++ gildas.patch 7 Nov 2009 10:56:12 -0000 1.13
@@ -71,8 +71,20 @@
diff -ruN --exclude='*~' gildas-src-nov09b/admin/Makefile.def
gildas-src-nov09b.patched/admin/Makefile.def
--- gildas-src-nov09b/admin/Makefile.def 2009-10-07 14:25:23.000000000
+0200
-+++ gildas-src-nov09b.patched/admin/Makefile.def 2009-11-04
12:02:33.000000000 +0100
-@@ -552,7 +552,7 @@
++++ gildas-src-nov09b.patched/admin/Makefile.def 2009-11-06
17:56:42.000000000 +0100
+@@ -450,8 +450,9 @@
+ # Assume that integers without specification (i.e. at declaration
+ # time) are kind=4 (32 bits)?
+ ifeq ($(GAG_USE_32BITS),yes)
+- GLOBAL_FFLAGS += -m32
+- GLOBAL_FLDFLAGS += -Wl,-m,elf_i386
++ # This is not supported yet! Have to find the correct options...
++ GLOBAL_FFLAGS +=
++ GLOBAL_FLDFLAGS +=
+ endif
+ endif
+ ifeq ($(GAG_OS_KIND),cygwin)
+@@ -552,7 +553,7 @@
###########################################################################
# Kernel libraries
@@ -81,25 +93,6 @@
GAG_LIBS = -lggui -lgcore -lgwcs -lgio -lgsys -lginc
ifeq ($(GAG_USE_XML),yes)
-diff -ruN --exclude='*~' gildas-src-nov09b/admin/define-system.sh
gildas-src-nov09b.patched/admin/define-system.sh
---- gildas-src-nov09b/admin/define-system.sh 2008-11-25 16:50:43.000000000
+0100
-+++ gildas-src-nov09b.patched/admin/define-system.sh 2009-11-04
12:02:33.000000000 +0100
-@@ -211,11 +211,11 @@
- DEFAULT_COMPILER=g95
- fi
- elif [ `uname -p` = "i386" ]; then
-- if [ `sysctl -n hw.optional.x86_64 2> /dev/null` = 1 ]; then
-- GAG_MACHINE=x86_64
-- else
-+# if [ `sysctl -n hw.optional.x86_64 2> /dev/null` = 1 ]; then
-+# GAG_MACHINE=x86_64
-+# else
- GAG_MACHINE=pc
-- fi
-+# fi
- if which ifort > /dev/null 2>&1; then
- DEFAULT_COMPILER=ifort
- else
diff -ruN --exclude='*~' gildas-src-nov09b/admin/gildas-env.sh
gildas-src-nov09b.patched/admin/gildas-env.sh
--- gildas-src-nov09b/admin/gildas-env.sh 2009-10-07 17:45:32.000000000
+0200
+++ gildas-src-nov09b.patched/admin/gildas-env.sh 2009-11-04
12:02:33.000000000 +0100
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- gildas.info 4 Nov 2009 14:20:05 -0000 1.31
+++ gildas.info 7 Nov 2009 10:56:12 -0000 1.32
@@ -1,7 +1,7 @@
Package: gildas
Version: 200911
-Revision: 1
-Architecture: powerpc, i386
+Revision: 2
+Architecture: powerpc, i386, x86_64
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <[email protected]>
@@ -11,25 +11,34 @@
fftw3-shlibs, gcc44-shlibs, libpng3-shlibs, lesstif-shlibs, x11
<<
BuildDepends: <<
- cfitsio, fink (>= 0.24.12-1), fftw3, gcc44, libpng3, lesstif, sed, slatec,
x11-dev
+ cfitsio, fink (>= 0.29.5-1), fftw3, gcc44, libpng3, lesstif, sed, slatec,
x11-dev
<<
PatchFile: gildas.patch
-PatchFile-MD5: 3f12ad46808f3ed7adafe3b112a9730b
+PatchFile-MD5: dcf4c21d299e0981f2b6a65fce387dda
CompileScript: <<
true
<<
InstallScript: <<
#!/bin/bash -e
- source admin/gildas-env.sh -s
/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/:%p/lib:%p/include
-c gfortran -n python -o 32bits
+ case %m in
+ "powerpc")
+ export arch="powerpc-darwin-gfortran" ;;
+ "i386")
+ export bitflag="-o 32bits"
+ if [ `sysctl -n hw.optional.x86_64 2> /dev/null` = 1 ]; then
+ export arch="x86_64-darwin-gfortran-32bits"
+ else
+ export arch="pc-darwin-gfortran-32bits"
+ fi ;;
+ "x86_64")
+ export bitflag=""
+ export arch="x86_64-darwin-gfortran" ;;
+ esac
+ source admin/gildas-env.sh -s
/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/:/usr/X11/lib:/usr/X11/include:%p/lib:%p/include
-c gfortran -n python ${bitflag}
export gagexedir=%i/lib/gildas
install -d %i/bin %i/lib
make install
- if [ `uname -p` = "powerpc" ]; then
- export arch='powerpc'
- else
- export arch='pc'
- fi
- mv %i/lib/gildas/${arch}-darwin-gfortran-32bits-no_python
%i/lib/gildas/darwin-gfortran-no_python
+ mv %i/lib/gildas/${arch}-no_python %i/lib/gildas/darwin-gfortran-no_python
cd %i/lib/gildas/darwin-gfortran-no_python/bin/
for file in * ; do
ln -s %p/lib/gildas/darwin-gfortran-no_python/bin/${file} %i/bin/${file}
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
