summaryrefslogtreecommitdiff
path: root/x11-toolkits/qt33
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2001-01-21 19:36:08 +0000
committerWill Andrews <will@FreeBSD.org>2001-01-21 19:36:08 +0000
commitceba73ff6e238505210e95907107aa7492eae755 (patch)
tree4da74eaf22906ab1127076ad6d55414b7c0f6c4f /x11-toolkits/qt33
parentavoid depending Xlib. (diff)
Add workaround (CFLAGS+=-frerun-cse-after-loops) for breakage in GCC
2.95.3. It's backwards compatible, so no need for OSVERSION or other checks like that. Also add new var - MAKE_JOBS, which allows you to adjust the -jN argument (I wanted this 'cause with more CPUs I can compile with MAKE_JOBS=4 or greater). Methinks this kind of thing belongs in bsd.port.mk, but anyway. I can now compile (with MAKE_JOBS=4) qt 1.45 in less than 4 minutes on my dual PIII-600E. :) Submitted by: sf (workaround) Requested by: alex (workaround)
Notes
Notes: svn path=/head/; revision=37416
Diffstat (limited to 'x11-toolkits/qt33')
-rw-r--r--x11-toolkits/qt33/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index ea89d309c284..0fa8c5e243ea 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -34,7 +34,11 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
-system-libmng -thread -no-opengl \
-I${LOCALBASE}/include -L${LOCALBASE}/lib
CONFIGURE_ENV= ${YES} yes | QTDIR=${WRKSRC}
+.if defined(MAKE_JOBS)
+MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}"
+.else
MAKE_ARGS+= MAKE="${GMAKE} -j2"
+.endif
MAKE_ENV= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib
CONFIG= ${WRKSRC}/configs/freebsd-g++-${STATIC}
@@ -66,7 +70,7 @@ pre-fetch:
pre-configure:
@${CP} ${CONFIG} ${CONFIG}.new
${SED} -e "s,gcc,${CC},g" -e "s,g\+\+,${CXX},g" -e "s,/usr/X11R6,${X11BASE},g" \
- -e "s,-pipe -O2,${CXXFLAGS},g" ${CONFIG}.new > ${CONFIG}
+ -e "s,-pipe -O2,${CXXFLAGS} -frerun-cse-after-loop,g" ${CONFIG}.new > ${CONFIG}
.if exists(${X11BASE}/lib/libXft.so) && !defined(NO_AA)
@${CP} ${CONFIG} ${CONFIG}.new
${SED} -e "s,= -lXext,= -lXft -lXext,g" -e "s,QT= -I,QT= -DQT_XFT -I,g" \