Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv7532
Modified Files:
gildas.info gildas.patch
Log Message:
Fix compilation bug on 10.5/powerpc
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- gildas.patch 8 Jul 2011 10:46:46 -0000 1.25
+++ gildas.patch 30 Jul 2011 14:01:41 -0000 1.26
@@ -1,6 +1,6 @@
-diff -ruN --exclude='*~' gildas-src-apr11f/admin/Makefile
gildas-src-apr11f.patched/admin/Makefile
+diff --exclude='*~' -ruN gildas-src-apr11f/admin/Makefile
gildas-src-apr11f.patched/admin/Makefile
--- gildas-src-apr11f/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
-+++ gildas-src-apr11f.patched/admin/Makefile 2011-06-29 16:39:04.000000000
+0200
++++ gildas-src-apr11f.patched/admin/Makefile 2011-07-29 22:39:38.000000000
+0200
@@ -33,31 +33,31 @@
integ: integ-message
@@ -55,9 +55,9 @@
+# @(echo)
###########################################################################
-diff -ruN --exclude='*~' gildas-src-apr11f/admin/Makefile.build
gildas-src-apr11f.patched/admin/Makefile.build
+diff --exclude='*~' -ruN gildas-src-apr11f/admin/Makefile.build
gildas-src-apr11f.patched/admin/Makefile.build
--- gildas-src-apr11f/admin/Makefile.build 2011-02-07 11:16:34.000000000
+0100
-+++ gildas-src-apr11f.patched/admin/Makefile.build 2011-06-29
16:39:04.000000000 +0200
++++ gildas-src-apr11f.patched/admin/Makefile.build 2011-07-29
22:39:38.000000000 +0200
@@ -313,6 +313,10 @@
-lm:
@@ -69,10 +69,20 @@
# Required by ASDM libs:
-lstdc++:
-diff -ruN --exclude='*~' gildas-src-apr11f/admin/Makefile.def
gildas-src-apr11f.patched/admin/Makefile.def
+diff --exclude='*~' -ruN gildas-src-apr11f/admin/Makefile.def
gildas-src-apr11f.patched/admin/Makefile.def
--- gildas-src-apr11f/admin/Makefile.def 2011-06-29 13:30:14.000000000
+0200
-+++ gildas-src-apr11f.patched/admin/Makefile.def 2011-06-29
16:41:09.000000000 +0200
-@@ -318,8 +318,8 @@
++++ gildas-src-apr11f.patched/admin/Makefile.def 2011-07-29
22:40:53.000000000 +0200
+@@ -259,6 +259,9 @@
+ GLOBAL_CPPFLAGS += -DBITS64="bits64"
+ endif
+ endif
++ifeq ($(GAG_MACHINE),powerpc)
++ GLOBAL_CPPFLAGS += -DEEEI="eeei"
++endif
+ ifeq ($(GAG_MACHINE),alpha)
+ GLOBAL_CPPFLAGS += -DIEEE="ieee" -DBITS64="bits64"
+ endif
+@@ -318,8 +321,8 @@
# C compilation
# C compiler name
@@ -83,7 +93,7 @@
ifeq ($(GAG_OS_KIND),hpux)
CC = c89
endif
-@@ -341,7 +341,7 @@
+@@ -341,7 +344,7 @@
endif
# GCC flags
@@ -92,7 +102,7 @@
# Generic to GCC
GLOBAL_CFLAGS += -pipe -fPIC
OPTION_CFLAGS += -Wall
-@@ -377,13 +377,6 @@
+@@ -377,13 +380,6 @@
# OS dependent flags
GLOBAL_CFLAGS += -D$(GAG_OS_KIND) -D$(LOCAL_UPPER_OS_KIND)
@@ -106,7 +116,7 @@
# External library flags
ifeq ($(PNG_PRESENT),yes)
GLOBAL_CFLAGS += -DPNG
-@@ -574,12 +567,12 @@
+@@ -574,12 +570,12 @@
# Compilation in 32 bits mode
GAG_32BITS_SWITCH = "-m32"
endif
@@ -121,9 +131,9 @@
_GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc
ifndef GAG_WIN32
GAG_LIBS = $(_GAG_LIBS)
-diff -ruN --exclude='*~' gildas-src-apr11f/admin/Makefile.python
gildas-src-apr11f.patched/admin/Makefile.python
+diff --exclude='*~' -ruN gildas-src-apr11f/admin/Makefile.python
gildas-src-apr11f.patched/admin/Makefile.python
--- gildas-src-apr11f/admin/Makefile.python 2011-02-08 15:40:52.000000000
+0100
-+++ gildas-src-apr11f.patched/admin/Makefile.python 2011-06-29
16:39:04.000000000 +0200
++++ gildas-src-apr11f.patched/admin/Makefile.python 2011-07-29
22:39:38.000000000 +0200
@@ -41,7 +41,7 @@
ifneq ($(MOD_IDENTITY),)
@@ -133,9 +143,9 @@
$(MV) $(builddir)/*.$(SO_EXT) $(pythondir)
$(builddir)/setup.py: setup.py.src Makefile
-diff -ruN --exclude='*~' gildas-src-apr11f/admin/gildas-env.sh
gildas-src-apr11f.patched/admin/gildas-env.sh
+diff --exclude='*~' -ruN gildas-src-apr11f/admin/gildas-env.sh
gildas-src-apr11f.patched/admin/gildas-env.sh
--- gildas-src-apr11f/admin/gildas-env.sh 2011-06-20 11:44:09.000000000
+0200
-+++ gildas-src-apr11f.patched/admin/gildas-env.sh 2011-06-29
16:39:04.000000000 +0200
++++ gildas-src-apr11f.patched/admin/gildas-env.sh 2011-07-29
22:39:38.000000000 +0200
@@ -438,7 +438,7 @@
if [ "$GAG_OS_KIND" = "cygwin" ]; then
gagenv_message "ATM 2009 is not supported under cygwin"
@@ -192,9 +202,9 @@
BLAS_PRESENT=yes
BLAS_LIB_DIR=$DIR
fi
-diff -ruN --exclude='*~' gildas-src-apr11f/packages/clic/lib/Makefile
gildas-src-apr11f.patched/packages/clic/lib/Makefile
+diff --exclude='*~' -ruN gildas-src-apr11f/packages/clic/lib/Makefile
gildas-src-apr11f.patched/packages/clic/lib/Makefile
--- gildas-src-apr11f/packages/clic/lib/Makefile 2011-02-02
16:58:56.000000000 +0100
-+++ gildas-src-apr11f.patched/packages/clic/lib/Makefile 2011-06-29
16:39:04.000000000 +0200
++++ gildas-src-apr11f.patched/packages/clic/lib/Makefile 2011-07-29
22:39:38.000000000 +0200
@@ -57,7 +57,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
@@ -204,9 +214,9 @@
else
ifeq ($(LINEAR),nag)
LINEAR_LIB_OBJECTS = mth_nag.o
-diff -ruN --exclude='*~' gildas-src-apr11f/packages/clic07/lib/Makefile
gildas-src-apr11f.patched/packages/clic07/lib/Makefile
+diff --exclude='*~' -ruN gildas-src-apr11f/packages/clic07/lib/Makefile
gildas-src-apr11f.patched/packages/clic07/lib/Makefile
--- gildas-src-apr11f/packages/clic07/lib/Makefile 2011-02-01
17:14:17.000000000 +0100
-+++ gildas-src-apr11f.patched/packages/clic07/lib/Makefile 2011-06-29
16:39:04.000000000 +0200
++++ gildas-src-apr11f.patched/packages/clic07/lib/Makefile 2011-07-29
22:39:38.000000000 +0200
@@ -52,7 +52,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- gildas.info 10 Jul 2011 09:11:34 -0000 1.56
+++ gildas.info 30 Jul 2011 14:01:41 -0000 1.57
@@ -1,6 +1,7 @@
Package: gildas
Version: 201104f
-Revision: 2
+Revision: 3
+Distribution: 10.5, 10.6
Architecture: powerpc, i386, x86_64
Description: Radioastronomy data analysis software
License: OSI-Approved
@@ -19,7 +20,7 @@
sed, slatec
<<
PatchFile: gildas.patch
-PatchFile-MD5: 9ce5da59fb5fbd46784f62bc4f41a715
+PatchFile-MD5: 7576c499f1fa5b1520d886bc68c1f1ac
CompileScript: <<
true
<<
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
