diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-07-27 10:31:45 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-07-27 10:31:45 +0000 |
| commit | 902b1b5d70c6590244badb51f35d1aa6c6507e42 (patch) | |
| tree | 0b5bfe8bf4502787e096c50663b599d32cdcb29e | |
| parent | - Update to 2.18 (diff) | |
The bug that makes gcc 3.4 choke on some amd64 inline assembler does not
only affect the Qt4 core ports but ports depending on them as well, so
try a more sweeping approach for a workaround.
Notes
Notes:
svn path=/head/; revision=196381
| -rw-r--r-- | Mk/bsd.qt.mk | 5 | ||||
| -rw-r--r-- | devel/qmake4/Makefile | 6 | ||||
| -rw-r--r-- | devel/qt4-designer/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/qt4-gui/Makefile | 4 |
4 files changed, 11 insertions, 12 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 58a24f10708c..6e819a515386 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -45,8 +45,13 @@ UIC?= ${QT_PREFIX}/bin/uic-qt4 QMAKE?= ${QT_PREFIX}/bin/qmake-qt4 QMAKESPEC?= ${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++ +.if ${OSVERSION} < 700042 && ${ARCH} == "amd64" +QTCPPFLAGS?= -fno-gcse +.else QTCPPFLAGS?= +.endif QTCGFLIBS?= + .endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) QT4_VERSION?= 4.3.0 diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index c85fcc4335de..41f8788784b8 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmake PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-opensource-src-${PORTVERSION} @@ -80,4 +80,8 @@ USE_GCC= 3.4+ CXXFLAGS+= -mieee .endif +.if ${OSVERSION} < 700042 && ${ARCH} == "amd64" +CXXFLAGS+= -fno-gcse +.endif + .include <bsd.port.post.mk> diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index 6d52b17983b1..706cdc1267a6 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -42,8 +42,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME} CONFIGURE_WRKSRC=${WRKSRC}/../../ -.include <bsd.port.pre.mk> - pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ @@ -62,10 +60,6 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc post-configure: -.if ${OSVERSION} < 700042 && ${ARCH} == "amd64" - ${REINPLACE_CMD} -E -e 's|CXXFLAGS[[:space:]]*=(.*)|CXXFLAGS=-fno-gcse\1|g' \ - ${WRKSRC}/../../src/gui/Makefile -.endif ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' ${WRKSRC}/src/uitools/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ @@ -73,4 +67,4 @@ post-configure: -E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \ ${WRKSRC}/../../lib/pkgconfig/*Qt* -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index b3a167e7b970..b00393eff1af 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -82,10 +82,6 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic post-configure: -.if ${OSVERSION} < 700042 && ${ARCH} == "amd64" - ${REINPLACE_CMD} -E -e 's|CXXFLAGS[[:space:]]*=(.*)|CXXFLAGS=-fno-gcse\1|g' \ - ${WRKSRC}/Makefile -.endif ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \ -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile ${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \ |