Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18940
Modified Files:
gildas.info gildas.patch
Log Message:
Fix a bug with the link on 10.4 PPC
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gildas.patch 25 Dec 2008 18:06:36 -0000 1.7
+++ gildas.patch 29 Mar 2009 17:27:26 -0000 1.8
@@ -1,6 +1,6 @@
-diff -ruN --exclude='*~' gildas-src-dec08b/admin/Makefile
gildas-src-dec08b.patched/admin/Makefile
---- gildas-src-dec08b/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
-+++ gildas-src-dec08b.patched/admin/Makefile 2008-12-06 00:17:24.000000000
+0100
+diff --exclude='*~' -ruN gildas-src-feb09c/admin/Makefile
gildas-src-feb09c.patched/admin/Makefile
+--- gildas-src-feb09c/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
++++ gildas-src-feb09c.patched/admin/Makefile 2009-03-28 16:41:39.000000000
+0100
@@ -33,31 +33,31 @@
integ: integ-message
@@ -55,21 +55,34 @@
+# @(echo)
###########################################################################
-diff -ruN --exclude='*~' gildas-src-dec08b/admin/Makefile.def
gildas-src-dec08b.patched/admin/Makefile.def
---- gildas-src-dec08b/admin/Makefile.def 2008-11-26 16:38:00.000000000
+0100
-+++ gildas-src-dec08b.patched/admin/Makefile.def 2008-12-06
14:22:47.000000000 +0100
-@@ -542,7 +542,7 @@
+diff --exclude='*~' -ruN gildas-src-feb09c/admin/Makefile.build
gildas-src-feb09c.patched/admin/Makefile.build
+--- gildas-src-feb09c/admin/Makefile.build 2009-01-06 14:51:28.000000000
+0100
++++ gildas-src-feb09c.patched/admin/Makefile.build 2009-03-29
17:48:02.000000000 +0200
+@@ -304,6 +304,8 @@
+
+ -lm:
+
++-lgcc_s.1:
++
+ # Required by ASDM libs:
+ -lstdc++:
+
+diff --exclude='*~' -ruN gildas-src-feb09c/admin/Makefile.def
gildas-src-feb09c.patched/admin/Makefile.def
+--- gildas-src-feb09c/admin/Makefile.def 2008-12-12 10:19:52.000000000
+0100
++++ gildas-src-feb09c.patched/admin/Makefile.def 2009-03-29
17:16:46.000000000 +0200
+@@ -542,7 +542,8 @@
###########################################################################
# Kernel libraries
-LEGACY_LIBS = -lslatec -llapack -lblas
-+LEGACY_LIBS = -lslatec -llapack -lf77blas
++# lgcc_s.1 seems to be needed on 10.4/PPC, not sure why
++LEGACY_LIBS = -lslatec -llapack -lf77blas -lgcc_s.1
GAG_LIBS = -lggui -lgcore -lgwcs -lgio -lgsys -lginc
- GUI_LIBS =
-diff -ruN --exclude='*~' gildas-src-dec08b/admin/define-system.sh
gildas-src-dec08b.patched/admin/define-system.sh
---- gildas-src-dec08b/admin/define-system.sh 2008-11-25 16:50:43.000000000
+0100
-+++ gildas-src-dec08b.patched/admin/define-system.sh 2008-12-06
00:17:24.000000000 +0100
+ GUI_DIRS += gx11
+diff --exclude='*~' -ruN gildas-src-feb09c/admin/define-system.sh
gildas-src-feb09c.patched/admin/define-system.sh
+--- gildas-src-feb09c/admin/define-system.sh 2008-11-25 16:50:43.000000000
+0100
++++ gildas-src-feb09c.patched/admin/define-system.sh 2009-03-28
16:41:39.000000000 +0100
@@ -211,11 +211,11 @@
DEFAULT_COMPILER=g95
fi
@@ -86,9 +99,9 @@
if which ifort > /dev/null 2>&1; then
DEFAULT_COMPILER=ifort
else
-diff -ruN --exclude='*~' gildas-src-dec08b/admin/gildas-env.sh
gildas-src-dec08b.patched/admin/gildas-env.sh
---- gildas-src-dec08b/admin/gildas-env.sh 2008-11-06 14:21:29.000000000
+0100
-+++ gildas-src-dec08b.patched/admin/gildas-env.sh 2008-12-06
14:17:20.000000000 +0100
+diff --exclude='*~' -ruN gildas-src-feb09c/admin/gildas-env.sh
gildas-src-feb09c.patched/admin/gildas-env.sh
+--- gildas-src-feb09c/admin/gildas-env.sh 2008-11-06 14:21:29.000000000
+0100
++++ gildas-src-feb09c.patched/admin/gildas-env.sh 2009-03-28
16:41:39.000000000 +0100
@@ -462,11 +462,11 @@
INC_PATH=`echo $LIB_PATH | sed -e "s&lib&include&g"`
#
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gildas.info 29 Mar 2009 07:58:04 -0000 1.24
+++ gildas.info 29 Mar 2009 17:27:26 -0000 1.25
@@ -1,6 +1,6 @@
Package: gildas
Version: 200902
-Revision: 2
+Revision: 3
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <[email protected]>
@@ -13,7 +13,7 @@
atlas, cfitsio, fink (>= 0.24.12-1), fftw3, gcc43, libpng3, lesstif, sed,
slatec, x11-dev
<<
PatchFile: gildas.patch
-PatchFile-MD5: be0c27598bae5b56289b822484052e7b
+PatchFile-MD5: d1064e675153fcb8e55e357fc711ceb6
CompileScript: <<
true
<<
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
