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
This commit is contained in:
Will Andrews 2002-02-10 04:25:47 +00:00
parent 0ff251dc90
commit d4c869e236
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=54468
5 changed files with 15 additions and 15 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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