diff options
| author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-06-05 10:43:43 +0000 |
|---|---|---|
| committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-06-05 10:43:43 +0000 |
| commit | 71b35cf6409611fa630a32c6c9d6163b031e2124 (patch) | |
| tree | c160cf80f8985eab7250ad7f41205fe9677d5f88 /math/goblin/files/patch-Makefile | |
| parent | Convert to new options framework (diff) | |
- Fix build with Tcl/Tk 8.6
- Also, make clang happier, even if GCC is still required
Reported by: miwi (Tcl/Tk 8.6 exp-run late comers)
Notes
Notes:
svn path=/head/; revision=319976
Diffstat (limited to 'math/goblin/files/patch-Makefile')
| -rw-r--r-- | math/goblin/files/patch-Makefile | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/math/goblin/files/patch-Makefile b/math/goblin/files/patch-Makefile index e066327156cb..83231f08c38c 100644 --- a/math/goblin/files/patch-Makefile +++ b/math/goblin/files/patch-Makefile @@ -1,26 +1,6 @@ ---- Makefile.orig 2010-05-28 10:41:25.000000000 +0000 -+++ Makefile 2010-05-28 10:41:41.000000000 +0000 -@@ -335,19 +335,11 @@ - shared : intro $(shared_objects) - - libgoblin.$(so_suffix) : $(lib_objects) $(shell_objects) --ifeq ($(CC),gcc) - $(LD) -shared -Wl,-soname,$@ -o $@ $^ $(LDFLAGS) $(LIBS) --else -- $(LD) -G -o $@ $^ $(LDFLAGS) $(LIBS) --endif - @echo "...Shared object ($@) has been successfully linked" - - libglpk.$(so_suffix) : $(glpk_objects) $(wrap_objects) --ifeq ($(CC),gcc) - $(LD) -shared -Wl,-soname,$@ -o $@ $(shell_objects) $^ -L. $(LDFLAGS) $(LIBS) -lgoblin --else -- $(LD) -G -o $@ $(shell_objects) $^ -L. $(LDFLAGS) $(LIBS) -lgoblin --endif - @echo "...Shared object ($@) has been successfully linked" - - -@@ -367,11 +359,7 @@ +--- Makefile.orig 2009-10-11 02:10:45.000000000 +0200 ++++ Makefile 2013-06-05 09:47:06.000000000 +0200 +@@ -367,11 +367,7 @@ else gosh : $(gosh_objects) $(shared_objects) |