From cf3531ebb2fa3f8246cfbbe5ad530da619f62b90 Mon Sep 17 00:00:00 2001 From: rakuco Date: Sat, 11 May 2013 17:31:45 +0000 Subject: 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 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 --- x11/qt4-graphicssystems-opengl/Makefile | 1 - x11/qt4-opengl/Makefile | 1 - 2 files changed, 2 deletions(-) (limited to 'x11') diff --git a/x11/qt4-graphicssystems-opengl/Makefile b/x11/qt4-graphicssystems-opengl/Makefile index 2c104162db26..6f9e05e69d45 100644 --- a/x11/qt4-graphicssystems-opengl/Makefile +++ b/x11/qt4-graphicssystems-opengl/Makefile @@ -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 \ diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile index 75e747c8039b..0138b44a6b2c 100644 --- a/x11/qt4-opengl/Makefile +++ b/x11/qt4-opengl/Makefile @@ -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 -- cgit