diff options
| author | Michael Haro <mharo@FreeBSD.org> | 2000-04-02 02:19:04 +0000 |
|---|---|---|
| committer | Michael Haro <mharo@FreeBSD.org> | 2000-04-02 02:19:04 +0000 |
| commit | e2ebfe8fb81ca06ec976f29dae89bdefe62faeb0 (patch) | |
| tree | a906a2dfb3a3cfbe5df1207bfe06d0f59a0dea7c /x11-servers/Xfstt | |
| parent | Add a patch for I18N fontset, and correct pkg/PLIST. (diff) | |
use CXX instead of c++ and don't compile with -g
PR: 17564
Submitted by: mi@kot.ne.mediaone.net
Diffstat (limited to 'x11-servers/Xfstt')
| -rw-r--r-- | x11-servers/Xfstt/files/patch-aa | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/x11-servers/Xfstt/files/patch-aa b/x11-servers/Xfstt/files/patch-aa index e004f5798459..cd8794d72c3a 100644 --- a/x11-servers/Xfstt/files/patch-aa +++ b/x11-servers/Xfstt/files/patch-aa @@ -1,6 +1,6 @@ ---- Makefile.orig Mon May 31 09:28:44 1999 -+++ Makefile Fri Mar 17 17:42:37 2000 -@@ -2,13 +2,13 @@ +--- Makefile.orig Sun May 30 23:28:44 1999 ++++ Makefile Sat Apr 1 18:15:32 2000 +@@ -2,16 +2,21 @@ MISCOPT = OPT = $(MISCOPT) $(MAXOPT) @@ -8,17 +8,27 @@ +#CFLAGS = $(OPT) -DMAGNIFY=0 -DNDEBUG #CFLAGS = -fprofile-arcs -ftest-coverage -DMAGNIFY=0 -CFLAGS = -g -Wall -pedantic $(MISCOPT) -DMAGNIFY=0 -+CFLAGS += -g -Wall -pedantic $(MISCOPT) -DMAGNIFY=0 ++CFLAGS += -Wall -pedantic $(MISCOPT) -DMAGNIFY=0 #CFLAGS = -O -Wall -pedantic -DDEBUG $(MISCOPT) -LFLAGS = -L/usr/X11R6/lib -L/usr/openwin/lib/X11 -LFLAGS = -g -L/usr/X11R6/lib ++.if !defined(CXXFLAGS) ++CXXFLAGS:=${CFLAGS} ++.endif ++CFLAGS := ${CXXFLAGS} -Wall -pedantic $(MISCOPT) -DMAGNIFY=0 + +-CC = c++ +-LD = c++ +#LFLAGS = -L/usr/X11R6/lib -L/usr/openwin/lib/X11 -+LFLAGS = -g -L$(X11BASE)/lib ++LFLAGS = -L$(X11BASE)/lib ++ ++CC = ${CXX} ++LD = ${CXX} - CC = c++ - LD = c++ -@@ -56,8 +56,8 @@ + OBJS = RAFile.o \ + TTFont.o \ +@@ -56,8 +61,8 @@ $(LD) -o $@ $(OBJS) xfstt.o encoding.o $(LFLAGS) -lm xfstt.o : xfstt.cpp xfstt.h ttf.h arch.h Makefile |