diff options
| author | eschnett <eschnett@5c1b1641-b641-47ec-b3d9-0f93d4c445ee> | 2010-06-09 02:24:28 +0000 |
|---|---|---|
| committer | eschnett <eschnett@5c1b1641-b641-47ec-b3d9-0f93d4c445ee> | 2010-06-09 02:24:28 +0000 |
| commit | 86219c16bbc44afb38252b1aef82c4477e668cb1 (patch) | |
| tree | 80eefe897db46ff4c7477ab257a427e76776dabc | |
| parent | 2997381434de88fcf22b16b9bd4dc6500563ad87 (diff) | |
Do not include _rien.o into library; this breaks on Mac OS X.
Do not build debug libraries.
Remove comment about Lorene not supporting parallel makes.
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/LORENE/trunk@14 5c1b1641-b641-47ec-b3d9-0f93d4c445ee
| -rw-r--r-- | LORENE.sh | 1 | ||||
| -rw-r--r-- | dist/makesystem.patch | 22 |
2 files changed, 14 insertions, 9 deletions
@@ -115,7 +115,6 @@ EOF # "regular" version and a "debug" version. Both are identical # (since we specified identical build options above), and we # ignore the "debug" version. - # Note also that Lorene's Makefiles do not support parallel makes. ${MAKE} cpp fortran export popd diff --git a/dist/makesystem.patch b/dist/makesystem.patch index 6c8af36..5a670e4 100644 --- a/dist/makesystem.patch +++ b/dist/makesystem.patch @@ -1,7 +1,7 @@ diff -ru Lorene.orig/C++/Makefile Lorene/C++/Makefile --- Lorene.orig/C++/Makefile 2010-05-04 02:45:10.000000000 -0500 +++ Lorene/C++/Makefile 2010-05-31 22:52:26.000000000 -0500 -@@ -2,140 +2,88 @@ +@@ -2,140 +2,93 @@ include $(HOME_LORENE)/local_settings @@ -127,16 +127,21 @@ diff -ru Lorene.orig/C++/Makefile Lorene/C++/Makefile +Source/Valencia\ +Source/Valeur + ++# Don't include _rien.o into the archive because it is not a valid object file +SUBLIBS = $(patsubst %,%/Objects/*.o,$(SUBDIRS)) +SUBGLIBS = $(patsubst %,%/Objects_g/*.o,$(SUBDIRS)) ++SUBLIBS_IGNORE = $(patsubst %,%/Objects/_rien.o,$(SUBDIRS)) ++SUBGLIBS_IGNORE = $(patsubst %,%/Objects_g/_rien.o,$(SUBDIRS)) + +.PHONY: subdirs $(SUBDIRS) + +subdirs: $(LIB) $(SUBDIRS) ++ rm -f $(SUBLIBS_IGNORE) + ar -rv $(LIB)/liblorene.a $(SUBLIBS) + $(RANLIB) $(LIB)/liblorene.a -+ ar -rv $(LIB)/liblorene_g.a $(SUBGLIBS) -+ $(RANLIB) $(LIB)/liblorene_g.a ++# rm -f $(SUBGLIBS_IGNORE) ++# ar -rv $(LIB)/liblorene_g.a $(SUBGLIBS) ++# $(RANLIB) $(LIB)/liblorene_g.a + +install: subdirs touch $(LIB)/date_mark @@ -2980,11 +2985,12 @@ diff -ru Lorene.orig/F77/Makefile Lorene/F77/Makefile - cd Source/Poisson2d; $(MAKE) $@ - ar -rv $@ $(?:.f=.o) - $(RANLIB) $@ -+ cd Source; $(MAKE) $(LIB)/liblorenef77_g.a -+ cd Source/Poisson2d; $(MAKE) $(LIB)/liblorenef77_g.a -+ ar -rv $(LIB)/liblorenef77_g.a $(?:.f=.o) -+ $(RANLIB) $(LIB)/liblorenef77_g.a - rm -f $(?:.f=.o) +- rm -f $(?:.f=.o) ++# cd Source; $(MAKE) $(LIB)/liblorenef77_g.a ++# cd Source/Poisson2d; $(MAKE) $(LIB)/liblorenef77_g.a ++# ar -rv $(LIB)/liblorenef77_g.a $(?:.f=.o) ++# $(RANLIB) $(LIB)/liblorenef77_g.a ++# rm -f $(?:.f=.o) uninstall: rm -f $(LIB)/liblorenef77.a |