diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2014-03-31 17:45:13 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2014-03-31 17:45:13 +0000 |
| commit | ce934b196720235f84dba05f133028813259d8c5 (patch) | |
| tree | e5a0f51d26c9cb3aa7003f7663894e834d76a553 /misc/estic/files/patch-estic-freebsd-x.mak | |
| parent | - Add staging support (diff) | |
- fix makefiles to honor CXX and CXXFLAGS
- fix some C++ problems
- mark BROKEN on FreeBSD10, no gcc 4.2
Notes
Notes:
svn path=/head/; revision=349780
Diffstat (limited to 'misc/estic/files/patch-estic-freebsd-x.mak')
| -rw-r--r-- | misc/estic/files/patch-estic-freebsd-x.mak | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/misc/estic/files/patch-estic-freebsd-x.mak b/misc/estic/files/patch-estic-freebsd-x.mak index 4582aa733c08..e8acd7fc2325 100644 --- a/misc/estic/files/patch-estic-freebsd-x.mak +++ b/misc/estic/files/patch-estic-freebsd-x.mak @@ -1,12 +1,11 @@ ---- estic/make/freebsd-x.mak.orig Fri Jan 31 03:57:24 1997 -+++ estic/make/freebsd-x.mak Tue Sep 6 09:54:21 2005 -@@ -27,12 +27,13 @@ +--- estic/make/freebsd-x.mak.orig 1997-01-31 03:57:24.000000000 +0100 ++++ estic/make/freebsd-x.mak 2014-03-28 17:00:36.000000000 +0100 +@@ -27,12 +27,12 @@ AR = ar LD = ld ZIP = zip -CC = g++ -+CXX ?= g++ -+CC = ${CXX} ++CC?= g++ LIB = ../spunk/spunk.a INCDIR = ../spunk @@ -16,7 +15,7 @@ # ------------------------------------------------------------------------------ -@@ -71,10 +72,10 @@ +@@ -71,10 +71,10 @@ icintcon.o \ iclog.o \ icmsgwin.o \ @@ -29,7 +28,7 @@ # ------------------------------------------------------------------------------ # -@@ -82,7 +83,7 @@ +@@ -82,7 +82,7 @@ all: xestic xestic: $(LIB) $(OBJS) @@ -38,7 +37,16 @@ # ------------------------------------------------------------------------------ -@@ -114,10 +115,10 @@ +@@ -90,7 +90,7 @@ + + depend dep: + @echo "Creating dependency information" +- $(CC) -I$(INCDIR) -DFREEBSD -MM *.cc > .depend ++ $(CC) $(CFLAGS) -MM *.cc > .depend + + # ------------------------------------------------------------------------------ + # Create a ZIP file +@@ -114,9 +114,10 @@ clean: -rm -f *.bak *~ @@ -48,6 +56,5 @@ zap: clean - -rm -f *.o -rm -f .depend -- |