diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-09-29 05:37:51 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-09-29 05:37:51 +0000 |
| commit | 51ea95812df4267a1948ccab29fef2c888f08400 (patch) | |
| tree | 15f71b42fce3a1c7c7caa10faf986fc329556870 /graphics/qdraw | |
| parent | - Install PostScript documentation, too (diff) | |
Fix build on -stable and respect CXX and CXXFLAGS
Notes
Notes:
svn path=/head/; revision=67220
Diffstat (limited to 'graphics/qdraw')
| -rw-r--r-- | graphics/qdraw/files/patch-unix_gcc.mk | 102 |
1 files changed, 78 insertions, 24 deletions
diff --git a/graphics/qdraw/files/patch-unix_gcc.mk b/graphics/qdraw/files/patch-unix_gcc.mk index 086bc4141900..89e5d32f7c65 100644 --- a/graphics/qdraw/files/patch-unix_gcc.mk +++ b/graphics/qdraw/files/patch-unix_gcc.mk @@ -1,28 +1,82 @@ --- make/unix_gcc.mk.orig Fri Jul 28 11:54:11 2000 -+++ make/unix_gcc.mk Mon Mar 18 07:29:27 2002 -@@ -33,13 +33,25 @@ - ifdef freebsd - GCCPATH= /usr - GCC= cc -+ifneq "${freebsd}" "34" - ifneq "${freebsd}" "40" -+ifneq "${freebsd}" "41" -+ifneq "${freebsd}" "42" -+ifneq "${freebsd}" "43" -+ifneq "${freebsd}" "44" -+ifneq "${freebsd}" "45" - ifneq "${freebsd}" "50" - GCCBASE= /usr/local - GCCTARGET= i386-unknown-freebsd3.0 - GCCVER= egcs-2.91.62 - GCCPATH= ${GCCBASE}/lib/gcc-lib/${GCCTARGET}/${GCCVER} - GCC= egcc -+endif -+endif -+endif -+endif -+endif -+endif ++++ make/unix_gcc.mk Sat Sep 28 21:55:53 2002 +@@ -30,19 +30,6 @@ + #LD = ${GCCPATH}/gcc + #CPP = ${GCCPATH}/g++ -E ${DEPINC} + +-ifdef freebsd +-GCCPATH= /usr +-GCC= cc +-ifneq "${freebsd}" "40" +-ifneq "${freebsd}" "50" +-GCCBASE= /usr/local +-GCCTARGET= i386-unknown-freebsd3.0 +-GCCVER= egcs-2.91.62 +-GCCPATH= ${GCCBASE}/lib/gcc-lib/${GCCTARGET}/${GCCVER} +-GCC= egcc +-endif +-endif +-endif + ifdef linux + GCCBASE= /usr + GCCTARGET= i686-pc-linux-gnu +@@ -51,17 +38,15 @@ + GCC= gcc endif + +-CC = ${GCC} -pipe +-CXX = ${GCC} -x c++ -pipe + AS = as +-LD = cc -pthread +-CPP = ${GCC} -x c++ -E ${DEPINC} ++LD = $(CC) -pthread ++CPP = $(CC) -x c++ -E ${DEPINC} + INSTALL = install -c + + + CPPFLAGS += -Dq_unix + +-CPPFLAGS += -I/usr/X11R6/include -I${GCCPATH}/include/g++ ++CPPFLAGS += -I/usr/X11R6/include + CPPFLAGS += -I/usr/local/include + + ifdef linux +@@ -70,7 +55,7 @@ + + + #CXXFLAGS = -ansi -Wall -g -fguiding-decls -D_THREAD_SAFE +-CXXFLAGS = -ansi -Wall -gdwarf-2 -D_THREAD_SAFE ++CXXFLAGS += -ansi -Wall -gdwarf-2 -D_THREAD_SAFE + + ifdef linux + CXXFLAGS += -D_SVID_SOURCE -D_BSD_SOURCE +@@ -80,17 +65,9 @@ + CPPFLAGS += -DDEBUG endif + +-ifdef noopt +- CXXFLAGS += -O0 +-else +- CXXFLAGS += -O2 +-endif +- + CFLAGS = ${CXXFLAGS} + +-ifdef freebsd +- DEPINC = -I${GCCPATH}/include/g++ +-else ++ifndef freebsd + DEPINC = -I${GCCPATH}/include/g++ -I${GCCPATH} endif + +@@ -115,10 +92,6 @@ + + ifdef linux + EXTRALIBS = -ldl +-endif +- +-ifneq "${freebsd}" "40" +- RUNPATH= -Wl,-rpath=${GCCPATH} -L${GCCPATH} + endif + + # assemble a file |