From d10688beb6d969f01e9127f97d32e50363140fc8 Mon Sep 17 00:00:00 2001
From: Sukneet Basuta
Date: Fri, 22 Jun 2012 17:41:57 -0400
Subject: atlas: if fortran is enabled, apply patch to not compile fortran libs
 (fixes #161) * no_fortran.patch: added, patch to not compile fortran libs *
 BUILD: Only install fortran libs if optional fortran depends is enabled

---
 cluster/atlas/HISTORY          |  6 ++++++
 cluster/atlas/INSTALL          | 14 +++++++++-----
 cluster/atlas/PRE_BUILD        |  6 +++++-
 cluster/atlas/no_fortran.patch | 16 ++++++++++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 cluster/atlas/no_fortran.patch

(limited to 'cluster')

diff --git a/cluster/atlas/HISTORY b/cluster/atlas/HISTORY
index 5495ff64a9..d1d45ff88d 100644
--- a/cluster/atlas/HISTORY
+++ b/cluster/atlas/HISTORY
@@ -1,3 +1,9 @@
+2012-06-22 Sukneet Basuta <sukneet@sourcemage.org>
+	* PRE_BUILD: if optional fortran depends is enabled, apply
+	  patch to not compile fortran libs
+	* no_fortran.patch: added, patch to not compile fortran libs
+	* BUILD: Only install fortran libs if optional fortran depends is enabled
+
 2011-05-15 Peng Chang (Charels) <chp@sourcemage.org>
 	* BUILD: fat_shared is still not prevailing, added make check and make time,
 	  these takes only 2 min, but definitely worth keeping record
diff --git a/cluster/atlas/INSTALL b/cluster/atlas/INSTALL
index 3fe412bfe5..b18db844b7 100755
--- a/cluster/atlas/INSTALL
+++ b/cluster/atlas/INSTALL
@@ -1,13 +1,17 @@
 make install  &&
 
 if [ $PT_LIB == y ]; then
-  mv -v lib/libptf77blas.so lib/libf77blas.so  &&
   mv -v lib/libptcblas.so lib/libcblas.so  &&
-  mv -v $INSTALL_ROOT/usr/lib/libptf77blas.a $INSTALL_ROOT/usr/lib/libf77blas.a  &&
-  mv -v $INSTALL_ROOT/usr/lib/libptcblas.a $INSTALL_ROOT/usr/lib/libcblas.a
+  mv -v $INSTALL_ROOT/usr/lib/libptcblas.a $INSTALL_ROOT/usr/lib/libcblas.a &&
+  if is_depends_enabled $SPELL fortran; then 
+    mv -v lib/libptf77blas.so lib/libf77blas.so  &&
+    mv -v $INSTALL_ROOT/usr/lib/libptf77blas.a $INSTALL_ROOT/usr/lib/libf77blas.a  
+  fi 
 else
-  rm -v $INSTALL_ROOT/usr/lib/libptf77blas.a  &&
-  rm -v $INSTALL_ROOT/usr/lib/libptcblas.a
+  rm -v $INSTALL_ROOT/usr/lib/libptcblas.a  &&
+  if is_depends_enabled $SPELL fortran; then
+    rm -v $INSTALL_ROOT/usr/lib/libptf77blas.a
+  fi
 fi  &&
 
 cp -v lib/*.so $INSTALL_ROOT/usr/lib
diff --git a/cluster/atlas/PRE_BUILD b/cluster/atlas/PRE_BUILD
index 9dbaf8ff89..09f47f3e90 100755
--- a/cluster/atlas/PRE_BUILD
+++ b/cluster/atlas/PRE_BUILD
@@ -3,4 +3,8 @@ mkdir  $SOURCE_DIRECTORY/bld  &&
 
 cd $SOURCE_DIRECTORY          &&
 patch configure $SPELL_DIRECTORY/configure.patch  &&
-patch CONFIG/src/backend/archinfo_x86.c $SPELL_DIRECTORY/x86.patch
+patch CONFIG/src/backend/archinfo_x86.c $SPELL_DIRECTORY/x86.patch &&
+
+if ! is_depends_enabled $SPELL fortran; then
+  patch -p1 < $SPELL_DIRECTORY/no_fortran.patch
+fi
diff --git a/cluster/atlas/no_fortran.patch b/cluster/atlas/no_fortran.patch
new file mode 100644
index 0000000000..05cf40008a
--- /dev/null
+++ b/cluster/atlas/no_fortran.patch
@@ -0,0 +1,16 @@
+--- ATLAS.o/makes/Make.lib	2011-05-14 13:33:24.000000000 -0400
++++ ATLAS/makes/Make.lib	2012-06-22 14:40:42.068787951 -0400
+@@ -33,11 +33,11 @@
+ 
+ ptshared :
+ 	- rm -f libatlas.so liblapack.so
+-	$(MAKE) libatlas.so liblapack.so libptf77blas.so libf77blas.so \
++	$(MAKE) libatlas.so liblapack.so \
+                 libptcblas.so libcblas.so liblapack.so
+ shared :
+ 	- rm -f libatlas.so liblapack.so
+-	$(MAKE) libatlas.so liblapack.so libf77blas.so libcblas.so liblapack.so
++	$(MAKE) libatlas.so liblapack.so libcblas.so liblapack.so
+ cptshared :
+ 	- rm -f libatlas.so libclapack.so
+ 	$(MAKE) libatlas.so libclapack.so libptcblas.so libcblas.so
-- 
cgit v1.2.3