summaryrefslogtreecommitdiffstats
path: root/cluster
diff options
context:
space:
mode:
authorIsmael Luceno2019-09-17 20:17:06 +0200
committerIsmael Luceno2019-09-17 20:57:50 +0200
commit870aefa7dbbf22edab5e25c2a33473c5c90d63ca (patch)
tree8f1a8cf2f779bc3bcc8822fafd6c74d3e6c92341 /cluster
parent2d0959ca6762fc4a5e3c550f819507b1ace03ebf (diff)
atlas: Replace no_fortran.patch by sed expression
Diffstat (limited to 'cluster')
-rw-r--r--cluster/atlas/HISTORY3
-rwxr-xr-xcluster/atlas/PRE_BUILD5
-rw-r--r--cluster/atlas/no_fortran.patch16
3 files changed, 7 insertions, 17 deletions
diff --git a/cluster/atlas/HISTORY b/cluster/atlas/HISTORY
index c7a4021a33..e034cf96f8 100644
--- a/cluster/atlas/HISTORY
+++ b/cluster/atlas/HISTORY
@@ -1,3 +1,6 @@
+2019-09-17 Ismael Luceno <ismael@sourcemage.org>
+ * PRE_BUILD, no_fortran.patch: Replaced patch by sed expression
+
2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/cluster/atlas/PRE_BUILD b/cluster/atlas/PRE_BUILD
index 09f47f3e90..7b8e1bd1df 100755
--- a/cluster/atlas/PRE_BUILD
+++ b/cluster/atlas/PRE_BUILD
@@ -6,5 +6,8 @@ patch configure $SPELL_DIRECTORY/configure.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
+ sedit '/^\t\$(MAKE)/{
+ s/ libptf77blas.so//
+ s/ libf77blas.so//
+ }' makes/Make.lib
fi
diff --git a/cluster/atlas/no_fortran.patch b/cluster/atlas/no_fortran.patch
deleted file mode 100644
index 05cf40008a..0000000000
--- a/cluster/atlas/no_fortran.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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