aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Bissey <f.r.bissey@massey.ac.nz>2010-08-17 00:07:18 +1200
committerFrançois Bissey <f.r.bissey@massey.ac.nz>2010-08-17 00:07:18 +1200
commit403c9c7f55f8088848721eb2cbf55a4d011740e9 (patch)
tree4f6b7eb846500d09eb77ba3a6b8fe64834199ba8 /sci-mathematics/lie/files
parentsci-geosciences/pydap_handlers_csv: Version bump. (diff)
downloadsci-403c9c7f55f8088848721eb2cbf55a4d011740e9.tar.gz
sci-403c9c7f55f8088848721eb2cbf55a4d011740e9.tar.bz2
sci-403c9c7f55f8088848721eb2cbf55a4d011740e9.zip
Fix last QA issues - hopefully that solved parallel make for good.
(Portage version: 2.2_rc67/git/Linux i686) (Unsigned Manifest commit)
Diffstat (limited to 'sci-mathematics/lie/files')
-rw-r--r--sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch28
1 files changed, 17 insertions, 11 deletions
diff --git a/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch b/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch
index 601bf0708..5bd54b403 100644
--- a/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch
+++ b/sci-mathematics/lie/files/parrallelmake-lie-2.2.2.patch
@@ -1,5 +1,5 @@
---- Makefile.orig 2010-08-15 23:55:28.989825847 +1200
-+++ Makefile 2010-08-15 23:57:15.251826046 +1200
+--- Makefile.orig 2010-08-16 23:59:45.463692224 +1200
++++ Makefile 2010-08-17 00:00:45.069692939 +1200
@@ -1,11 +1,11 @@
srcdir :=$(shell pwd)
@@ -14,16 +14,18 @@
# These settings should also be used in subdirectories:
export CC all-C-flags fixed-flags CFLAGS
-@@ -58,7 +58,7 @@
- math_functions:
- $(MAKE) -C box all
+@@ -49,9 +49,7 @@
+ # To 'make all', we first descend into the subdirectories, and afterwards
+ # return to finish here.
--binding_functions:
-+binding_functions: math_functions
- $(MAKE) -C static
+-all:
+- $(MAKE) math_functions binding_functions
+- $(MAKE) finish
++all: math_functions binding_functions finish
+ finish: lie Lie.exe LEARN.ind INFO.ind # do not call 'make finish' directly
-@@ -98,9 +98,9 @@
+@@ -98,12 +96,12 @@
# been set to the most recent one of object files in the respective
# subdirectories, whence taking that dummy file as dependency suffices.
@@ -34,8 +36,12 @@
+gapdate.o: date.c $(GAP_objects) math_functions binding_functions
$(CC) -ansi -c -o gapdate.o date.c
- Lie.exe: date.o
-@@ -131,7 +131,7 @@
+-Lie.exe: date.o
++Lie.exe: math_functions binding_functions date.o
+ $(CC) -o Lie.exe $(LDFLAGS) $(objects) date.o static/*.o box/*.o -lreadline -lncurses
+ chmod g+w Lie.exe
+ Liegap.exe: gapdate.o
+@@ -131,7 +129,7 @@
learnind: util/learnind.c
$(MAKE) -C util ../learnind