summary refs log tree commit diff
path: root/pkgs/applications/science/math/sage/spkg-singular.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/science/math/sage/spkg-singular.patch')
-rw-r--r--pkgs/applications/science/math/sage/spkg-singular.patch16
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/science/math/sage/spkg-singular.patch b/pkgs/applications/science/math/sage/spkg-singular.patch
index d561768600b..606ffcd3ad4 100644
--- a/pkgs/applications/science/math/sage/spkg-singular.patch
+++ b/pkgs/applications/science/math/sage/spkg-singular.patch
@@ -1,11 +1,17 @@
---- old/build/pkgs/singular/spkg-install	2017-10-15 10:35:41.826540964 -0500
-+++ new/build/pkgs/singular/spkg-install	2017-10-15 10:36:40.613743443 -0500
-@@ -4,6 +4,9 @@
+diff --git a/build/pkgs/singular/spkg-install b/build/pkgs/singular/spkg-install
+index 8caafb1699..3c34e6608a 100644
+--- a/build/pkgs/singular/spkg-install
++++ b/build/pkgs/singular/spkg-install
+@@ -2,6 +2,13 @@
  ## Singular
  ###########################################
  
-+find . -type f -exec sed -e 's@/bin/rm@rm@g' -i '{}' ';'
-+#echo '#!/usr/bin/env bash\nIgnoring missing $1' > src/build-aux/missing
++# Fix hardcoded paths, while making sure to only update timestamps of actually
++# changed files (otherwise confuses make)
++grep -rlF '/bin/rm' . | while read file
++do
++	sed -e 's@/bin/rm@rm@g' -i "$file"
++done
 +
  if [ -z "$SAGE_LOCAL" ]; then
      echo >&2 "Error: SAGE_LOCAL undefined -- exiting..."