summaryrefslogtreecommitdiffstats
path: root/x11-toolkits/qt32
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2002-02-10 04:25:47 +0000
committerwill <will@FreeBSD.org>2002-02-10 04:25:47 +0000
commite4ce2f463a2c489d5005d41c1f5074a6ee971ab4 (patch)
tree4668681ddc1ae92dff65817a52c9fcd5294c33f6 /x11-toolkits/qt32
parent0bd08f818f6abae513883637923453f1b9fd0826 (diff)
downloadFreeBSD-ports-e4ce2f463a2c489d5005d41c1f5074a6ee971ab4.zip
FreeBSD-ports-e4ce2f463a2c489d5005d41c1f5074a6ee971ab4.tar.gz
Remove -frerun-cse-after-loop, a vestige from the days when our compiler
was slightly broken [1]. Allow alpha users to remove -O0 from CFLAGS if they so desire [2]. Replace -O2 in config with whatever ${CFLAGS} happens to be, with a perl regex. Submitted by: [1] sf [2] naddy
Diffstat (limited to 'x11-toolkits/qt32')
-rw-r--r--x11-toolkits/qt32/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 6784057..cf6aeed 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -65,7 +65,7 @@ PLIST_SUB+= SHARED="" STATIC="@comment "
.include <bsd.port.pre.mk>
-.if ${MACHINE_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha" && !defined(NO_ALPHA_UNOPTIMIZATION)
CFLAGS+= -O0
.endif
@@ -97,8 +97,8 @@ post-patch:
pre-configure: qt-pre-configure
${PERL} -pi -e "s,gcc,${CC},g; s,g\+\+,${CXX},g; \
- s,/usr/X11R6,${X11BASE},g; \
- s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_ -frerun-cse-after-loop,g" ${CONFIG}
+ s,/usr/X11R6,${X11BASE},g;s,-O2,${CFLAGS},g; \
+ s,-fno-exceptions,-fno-exceptions ${CXXFLAGS} -I/usr/include -D_PTH_H_ -D_PTH_PTHREAD_H_,g" ${CONFIG}
${PERL} -pi -e "s,VER_MAJ = 2,VER_MAJ = 4,g; \
s,TARGET = qt,TARGET = qt2,g" ${WRKSRC}/src/Makefile.in
${PERL} -pi -e "s@TARGET\t= moc@TARGET = moc2@g" ${WRKSRC}/src/moc/Makefile.in
OpenPOWER on IntegriCloud