Date: Sat, 11 May 2013 17:31:46 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317896 - in head: devel/qt4-corelib devel/qt4-corelib/files graphics/qt4-imageformats www/qt4-webkit x11-toolkits/qt4-gui x11/qt4-graphicssystems-opengl x11/qt4-opengl Message-ID: <201305111731.r4BHVkaN087322@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Sat May 11 17:31:45 2013 New Revision: 317896 URL: http://svnweb.freebsd.org/changeset/ports/317896 Log: Import my upstream commit to fix the detection of 3dNOW! support. The patch was originally written by dim@ and fixes the way Qt includes the <mm3dnow.h> header. See the upstream commits' message for more information. Practically speaking, this should make the Qt ports build with clang on i386 again, and allows us to revert commits r316233, r316348 and r316341: miwi was very laconic in his commit messages, but the changes all point to the issue being fixed here. Submitted by: dim Added: head/devel/qt4-corelib/files/patch-git_ccd1b2ee (contents, props changed) Modified: head/devel/qt4-corelib/Makefile head/graphics/qt4-imageformats/Makefile head/www/qt4-webkit/Makefile head/x11-toolkits/qt4-gui/Makefile head/x11/qt4-graphicssystems-opengl/Makefile head/x11/qt4-opengl/Makefile Modified: head/devel/qt4-corelib/Makefile ============================================================================== --- head/devel/qt4-corelib/Makefile Sat May 11 17:18:48 2013 (r317895) +++ head/devel/qt4-corelib/Makefile Sat May 11 17:31:45 2013 (r317896) @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= devel PKGNAMEPREFIX= qt4- @@ -14,7 +14,6 @@ LIB_DEPENDS= icui18n:${PORTSDIR}/devel/i USES= pkgconfig USE_GNOME= _glib20 -USE_GCC= any USE_QT4= qmake_build moc_build QT_NONSTANDARD= yes QT_DIST= yes Added: head/devel/qt4-corelib/files/patch-git_ccd1b2ee ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt4-corelib/files/patch-git_ccd1b2ee Sat May 11 17:31:45 2013 (r317896) @@ -0,0 +1,35 @@ +commit ccd1b2ee01c193cd157978c1f9f08f87d0f9c94b +Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> +Date: Fri May 10 01:40:23 2013 +0300 + + Check that 3DNow! instructions are supported before including mm3dnow.h. + + Include mm3dnow.h the way we already include the (S)SSE{3,4} and AVX + instruction headers: by checking that the compiler is set to support those + instructions besides verifying that QT_HAVE_3DNOW evalues to true (which + only means the compiler supported them when the build was being configured). + + This has not caused a problem in most cases so far because GCC protects its + mm3dnow.h header with an #ifdef __3dNOW__ (contrary to what it does on, say, + pmmintrin.h). clang's mm3dnow.h, on the other hand, does not have that check + and can fail if -march is set to, for example, i386 or i486. + + Not backported from qt5 because qtbase because qsimd_p.h does not include + the 3DNow! headers after commit a1b30b49ef09bef2e97b9a0622bf7ad622678fee. + + Change-Id: I15ab5e936c71c55f89c3f25777ab27fbd262e9cd + Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> + +diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h +index 87e26e1..6a32e8f 100644 +--- ./src/corelib/tools/qsimd_p.h ++++ ./src/corelib/tools/qsimd_p.h +@@ -199,7 +199,7 @@ QT_BEGIN_HEADER + #endif + + // 3D now intrinsics +-#if defined(QT_HAVE_3DNOW) ++#if defined(QT_HAVE_3DNOW) && (defined(__3dNOW__) || defined(Q_CC_MSVC)) + #include <mm3dnow.h> + #endif + Modified: head/graphics/qt4-imageformats/Makefile ============================================================================== --- head/graphics/qt4-imageformats/Makefile Sat May 11 17:18:48 2013 (r317895) +++ head/graphics/qt4-imageformats/Makefile Sat May 11 17:31:45 2013 (r317896) @@ -14,7 +14,6 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/j png15:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff -USE_GCC= any USE_QT4= qmake_build moc_build rcc_build corelib gui svg xml QT_NONSTANDARD= yes QT_DIST= yes Modified: head/www/qt4-webkit/Makefile ============================================================================== --- head/www/qt4-webkit/Makefile Sat May 11 17:18:48 2013 (r317895) +++ head/www/qt4-webkit/Makefile Sat May 11 17:31:45 2013 (r317896) @@ -10,7 +10,6 @@ PKGNAMEPREFIX= qt4- MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 WebKit engine -USE_GCC= any USES= pkgconfig USE_QT4= corelib declarative gui network \ qmake_build moc_build rcc_build Modified: head/x11-toolkits/qt4-gui/Makefile ============================================================================== --- head/x11-toolkits/qt4-gui/Makefile Sat May 11 17:18:48 2013 (r317895) +++ head/x11-toolkits/qt4-gui/Makefile Sat May 11 17:31:45 2013 (r317896) @@ -18,7 +18,6 @@ QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes -USE_GCC= any HAS_CONFIGURE= yes USES= pkgconfig USE_LDCONFIG= ${PREFIX}/lib/qt4 Modified: head/x11/qt4-graphicssystems-opengl/Makefile ============================================================================== --- head/x11/qt4-graphicssystems-opengl/Makefile Sat May 11 17:18:48 2013 (r317895) +++ head/x11/qt4-graphicssystems-opengl/Makefile Sat May 11 17:31:45 2013 (r317896) @@ -17,7 +17,6 @@ MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_GL= glu -USE_GCC= any ALL_TARGET= first CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \ Modified: head/x11/qt4-opengl/Makefile ============================================================================== --- head/x11/qt4-opengl/Makefile Sat May 11 17:18:48 2013 (r317895) +++ head/x11/qt4-opengl/Makefile Sat May 11 17:31:45 2013 (r317896) @@ -14,7 +14,6 @@ QT_NONSTANDARD= yes QT_DIST= yes MAKE_JOBS_SAFE= yes -USE_GCC= any HAS_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/qt4 USE_GL= gl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305111731.r4BHVkaN087322>