aboutsummaryrefslogtreecommitdiffstats
path: root/cad
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2003-07-19 08:50:39 +0800
committermaho <maho@FreeBSD.org>2003-07-19 08:50:39 +0800
commit0e39a5c69a6f13c8e6f60c1ca5d3c5ae12b2c757 (patch)
treefe010b7d822cf819fb968762b9afb771d936eb7e /cad
parentaf2196660aa1ea99868300af0b59b71b9c8af26e (diff)
downloadfreebsd-ports-gnome-0e39a5c69a6f13c8e6f60c1ca5d3c5ae12b2c757.tar.gz
freebsd-ports-gnome-0e39a5c69a6f13c8e6f60c1ca5d3c5ae12b2c757.tar.zst
freebsd-ports-gnome-0e39a5c69a6f13c8e6f60c1ca5d3c5ae12b2c757.zip
Honor CXXFLAGS.
Submitted by: Pedro F. Giffuni <giffunip@yahoo.com>
Diffstat (limited to 'cad')
-rw-r--r--cad/tochnog/Makefile4
-rw-r--r--cad/tochnog/files/patch-makefile6
2 files changed, 5 insertions, 5 deletions
diff --git a/cad/tochnog/Makefile b/cad/tochnog/Makefile
index b1ca841911d9..2fd45094fe31 100644
--- a/cad/tochnog/Makefile
+++ b/cad/tochnog/Makefile
@@ -26,7 +26,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libsuperlu.a:${PORTSDIR}/math/superlu
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500113
-USE_GCC= 2.95
+USE_GCC= 2.95 # 3.2 should also work !!
.endif
USE_REINPLACE= yes
@@ -63,7 +63,7 @@ post-patch:
.endif
post-build:
- @(cd ${WRKDIR}/tochnog/tools; ${CXX} ${CFLAGS} -o aba2tn aba2tn.cc)
+ @(cd ${WRKDIR}/tochnog/tools; ${CXX} ${CXXFLAGS} -o aba2tn aba2tn.cc)
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tochnog ${PREFIX}/bin
diff --git a/cad/tochnog/files/patch-makefile b/cad/tochnog/files/patch-makefile
index fd9d6fcf31fc..c6d77afd049f 100644
--- a/cad/tochnog/files/patch-makefile
+++ b/cad/tochnog/files/patch-makefile
@@ -29,7 +29,7 @@
-COMPILER_FLAGS= -c -O2 -w-
+COMPILER_C=$(CC)
+COMPILER_CPP=$(CXX)
-+COMPILER_FLAGS=$(CFLAGS) -c
++COMPILER_FLAGS=$(CXXFLAGS) -c
OBJ=obj
-LINK_FLAGS_BEFORE= -l$(F2C)
+LINK_FLAGS_BEFORE= -l$(F2C) -L%%LOCALBASE%%/lib
@@ -72,7 +72,7 @@
- "COMPILER_C=gcc" \
- "COMPILER_CPP=g++" \
- "COMPILER_FLAGS= -ansi -c -O2 -Wall $(PROFILE) $(ALL_INCLUDE)" \
-+ "COMPILER_FLAGS= -c ${CFLAGS} $(ALL_INCLUDE)" \
++ "COMPILER_FLAGS= -c ${CXXFLAGS} $(ALL_INCLUDE)" \
"LINK_FLAGS_BEFORE=" \
"LINK_FLAGS_AFTER= $(PROFILE) $(ALL_LIB) -static -lm -o tochnog"
@@ -81,7 +81,7 @@
+ make tochnog \
+ "SYS_FILE=sysposix" \
+ "OBJ=o" \
-+ "COMPILER_FLAGS= -c ${CFLAGS} %%PTHREAD_CFLAGS%% -D_REENTRANT $(ALL_INCLUDE)" \
++ "COMPILER_FLAGS= -c ${CXXFLAGS} %%PTHREAD_CFLAGS%% -D_REENTRANT $(ALL_INCLUDE)" \
+ "LINK_FLAGS_BEFORE=" \
+ "LINK_FLAGS_AFTER= $(ALL_LIB) %%PTHREAD_LIBS%% -static -lm -o tochnog"
+