aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-toolkits/qt145/Makefile10
-rw-r--r--x11-toolkits/qt22/Makefile6
-rw-r--r--x11-toolkits/qt23/Makefile6
-rw-r--r--x11-toolkits/qt30/Makefile6
-rw-r--r--x11-toolkits/qt31/Makefile6
-rw-r--r--x11-toolkits/qt32/Makefile6
-rw-r--r--x11-toolkits/qt33/Makefile6
7 files changed, 38 insertions, 8 deletions
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index 3f9733d30a2a..7c784bc9c2ba 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -21,7 +21,13 @@ NO_LATEST_LINK= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
USE_NEWGCC= yes
-MAKE_ENV+= QTDIR=${WRKSRC} CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" CC="${CC}"
+.if defined(MAKE_JOBS)
+MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}"
+.else
+MAKE_ARGS+= MAKE="${GMAKE} -j2"
+.endif
+MAKE_ENV+= QTDIR=${WRKSRC} CXX="${CXX}" \
+ CXXFLAGS="${CXXFLAGS} -frerun-cse-after-loop" CC="${CC}"
VER_MAJ= 3
VER_MIN= 0
@@ -50,7 +56,7 @@ post-patch:
post-configure:
@${PERL} -pi -e "s:g\+\+:${CXX}:g ; \
s:/usr/X11R6:${PREFIX}:g ; \
- s:%%CXXFLAGS%%:${CXXFLAGS}:g ; \
+ s:%%CXXFLAGS%%:${CXXFLAGS} -frerun-cse-after-loop:g ; \
s:%%VERSION%%:${VERSION}:g" ${WRKSRC}/configs/freebsd-g++-${STATIC}
@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} freebsd-g++-${STATIC})
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index ea89d309c284..0fa8c5e243ea 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/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" \
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index ea89d309c284..0fa8c5e243ea 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/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" \
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index ea89d309c284..0fa8c5e243ea 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/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" \
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index ea89d309c284..0fa8c5e243ea 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/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" \
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index ea89d309c284..0fa8c5e243ea 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/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" \
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" \