diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-07-18 19:13:37 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-07-18 19:13:37 +0000 |
| commit | 9a9b7d5e9b231108e52f4026b8929c5d33a4eb2b (patch) | |
| tree | 67c02fb247d0f491fdcc4b336335435235b5a9f8 /sci-chemistry/aqua/files/3.2-flags.patch | |
| parent | Marked ppc stable for bug #295256. (diff) | |
| download | gentoo-2-9a9b7d5e9b231108e52f4026b8929c5d33a4eb2b.tar.gz gentoo-2-9a9b7d5e9b231108e52f4026b8929c5d33a4eb2b.tar.bz2 gentoo-2-9a9b7d5e9b231108e52f4026b8929c5d33a4eb2b.zip | |
New addition
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/aqua/files/3.2-flags.patch')
| -rw-r--r-- | sci-chemistry/aqua/files/3.2-flags.patch | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/sci-chemistry/aqua/files/3.2-flags.patch b/sci-chemistry/aqua/files/3.2-flags.patch new file mode 100644 index 000000000000..cd12fbb9a324 --- /dev/null +++ b/sci-chemistry/aqua/files/3.2-flags.patch @@ -0,0 +1,84 @@ +diff --git a/src/makefile b/src/makefile +index 3113471..dd7a320 100644 +--- a/src/makefile ++++ b/src/makefile +@@ -176,47 +176,46 @@ nrutil.h: + # Executable files + + $(BIN)/AquaWhat: AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS) +- $(CC) -o $(BIN)/AquaWhat AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS) $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o $(BIN)/AquaWhat AquaWhat.o $(OBJECTS) $(R_OBJECTS) $(RNG_OBJECTS) + + $(BIN)/AquaHow: AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS) +- $(CC) -o $(BIN)/AquaHow AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o $(BIN)/AquaHow AquaHow.o $(OBJECTS) $(R_OBJECTS) AquaFuncts_dr.o $(RNG_OBJECTS) + + $(BIN)/AquaPseudo: AquaPseudo.o $(OBJECTS) $(R_OBJECTS) +- $(CC) -o $(BIN)/AquaPseudo AquaPseudo.o $(OBJECTS) $(R_OBJECTS) $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o $(BIN)/AquaPseudo AquaPseudo.o $(OBJECTS) $(R_OBJECTS) + + $(BIN)/AquaDist: AquaDist.o $(OBJECTS) +- $(CC) -o $(BIN)/AquaDist AquaDist.o $(OBJECTS) $(LDFLAGS) -lm ++ $(CC) $(LDFLAGS) -o $(BIN)/AquaDist AquaDist.o $(OBJECTS) -lm + + $(BIN)/AquaCalc: AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) +- $(CC) -o $(BIN)/AquaCalc AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) $(LDFLAGS) -lm ++ $(CC) $(LDFLAGS) -o $(BIN)/AquaCalc AquaCalc.o $(OBJECTS) $(RNG_OBJECTS) -lm + + $(BIN)/AquaAssign: AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) +- $(CC) -o $(BIN)/AquaAssign AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o $(BIN)/AquaAssign AquaAssign.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) + + $(BIN)/AquaCompl: AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) +- $(CC) -o $(BIN)/AquaCompl AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS) -lm ++ $(CC) $(LDFLAGS) -o $(BIN)/AquaCompl AquaCompl.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) -lm + + $(BIN)/AquaRedun: AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) +- $(CC) -o $(BIN)/AquaRedun AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o $(BIN)/AquaRedun AquaRedun.o AquaCommon.o $(OBJECTS) $(R_OBJECTS) nrutil.o AquaFuncts_dr.o $(RNG_OBJECTS) + + $(BIN)/testnew: testnew.o $(OBJECTS) +- $(CC) -o $(BIN)/testnew testnew.o $(OBJECTS) $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o $(BIN)/testnew testnew.o $(OBJECTS) + + $(BIN)/getproj: getproj.c +- $(CC) -o $(BIN)/getproj -O getproj.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN)/getproj getproj.c + + $(BIN)/AquaPlot: AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o +- $(CC) -o $(BIN)/AquaPlot AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o $(BIN)/AquaPlot AquaPlot.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o + + $(BIN)/Qext: Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o +- $(CC) -o $(BIN)/Qext Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o $(BIN)/Qext Qext.o $(LIB)/MenuFuncts.o $(LIB)/Functs.o + + $(BIN)/StarTest: StarTest.o +- $(CC) -o $(BIN)/StarTest StarTest.o $(LDFLAGS) $(STARFLAGS) $(STARLIBS) ++ $(CC) $(LDFLAGS) -o $(BIN)/StarTest StarTest.o $(STARFLAGS) $(STARLIBS) + + exth: exth.f +- f77 -o exth -O2 exth.f +- strip exth ++ $(FC) $(FFLAGS) -o exth -O2 exth.f + + + # Object files +@@ -269,7 +268,7 @@ AquaCommon.o: AquaCommon.c AquaCommon.h nrutil.h \ + $(CC) -c AquaCommon.c $(CFLAGS) + + nrutil.o: nrutil.c nrutil.h +- $(CC) -c nrutil.c -DANSI ++ $(CC) $(CFLAGS) -c nrutil.c -DANSI + + AquaFuncts.o: AquaFuncts.c AquaFuncts.h AquaFuncts_cv.h AquaFuncts_io.h\ + AquaStrucset.h AquaFiles.h\ +@@ -319,7 +318,7 @@ $(LIB)/MenuFuncts.o: $(LIB)/MenuFuncts.c $(LIB)/MenuTypes.h $(LIB)/MenuFuncts.h\ + cd $(LIB); $(CC) -c MenuFuncts.c $(CFLAGS) + + cv_subs.o: cv_subs.f +- f77 -c cv_subs.f $(FFLAGS) ++ $(FC) -c cv_subs.f $(FFLAGS) + + Qext.o: Qext.c Qext.h\ + $(LIB)/MenuFuncts.h $(LIB)/Functs.h $(G_HEADERS) |