svn commit: r387281 - in head: Mk devel/qt5-core x11-toolkits/qt5-declarative x11-toolkits/qt5-gui

[Antoine Brodin]

On Sun, May 24, 2015 at 4:41 PM, Tijl Coosemans <tijl at freebsd.org> wrote:
> Author: tijl
> Date: Sun May 24 16:41:16 2015
> New Revision: 387281
> URL: https://svnweb.freebsd.org/changeset/ports/387281
>
> Log:
>   Qt 5.3 removed runtime detection of SSE2 so it needs to be configured
>   with -no-sse2 at buildtime on i386.
>
>   PR:           198738, 200258
>   Reported by:  sasamotikomi at gmail.com
>   Approved by:  maintainer timeout (2 weeks)
>

Hi,

This doesn't seem to work with fmake:

"/usr/ports/Mk/bsd.qt.mk", line 149: Malformed conditional (${ARCH} ==
i386 && !(defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2}))

Cheers,

Antoine

> Modified:
>   head/Mk/bsd.qt.mk
>   head/devel/qt5-core/Makefile
>   head/x11-toolkits/qt5-declarative/Makefile
>   head/x11-toolkits/qt5-gui/Makefile
>
> Modified: head/Mk/bsd.qt.mk
> ==============================================================================
> --- head/Mk/bsd.qt.mk   Sun May 24 16:27:37 2015        (r387280)
> +++ head/Mk/bsd.qt.mk   Sun May 24 16:41:16 2015        (r387281)
> @@ -146,6 +146,9 @@ CONFIGURE_ARGS+=-nomake examples -nomake
>                                 -qmldir ${PREFIX}/${QT_QMLDIR_REL} \
>                                 -examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \
>                                 -testsdir ${PREFIX}/${QT_TESTDIR_REL}
> +.  if ${ARCH} == i386 && !(defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2})
> +CONFIGURE_ARGS+=-no-sse2
> +.  endif
>  . endif
>
>  . if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
>
> Modified: head/devel/qt5-core/Makefile
> ==============================================================================
> --- head/devel/qt5-core/Makefile        Sun May 24 16:27:37 2015        (r387280)
> +++ head/devel/qt5-core/Makefile        Sun May 24 16:41:16 2015        (r387281)
> @@ -2,7 +2,7 @@
>
>  PORTNAME=      core
>  DISTVERSION=   ${QT5_VERSION}
> -PORTREVISION=  1
> +PORTREVISION=  2
>  CATEGORIES=    devel
>  PKGNAMEPREFIX= qt5-
>
>
> Modified: head/x11-toolkits/qt5-declarative/Makefile
> ==============================================================================
> --- head/x11-toolkits/qt5-declarative/Makefile  Sun May 24 16:27:37 2015        (r387280)
> +++ head/x11-toolkits/qt5-declarative/Makefile  Sun May 24 16:41:16 2015        (r387281)
> @@ -2,6 +2,7 @@
>
>  PORTNAME=      declarative
>  DISTVERSION=   ${QT5_VERSION}
> +PORTREVISION=  1
>  CATEGORIES=    x11-toolkits
>  PKGNAMEPREFIX= qt5-
>
>
> Modified: head/x11-toolkits/qt5-gui/Makefile
> ==============================================================================
> --- head/x11-toolkits/qt5-gui/Makefile  Sun May 24 16:27:37 2015        (r387280)
> +++ head/x11-toolkits/qt5-gui/Makefile  Sun May 24 16:41:16 2015        (r387281)
> @@ -2,7 +2,7 @@
>
>  PORTNAME=      gui
>  DISTVERSION=   ${QT5_VERSION}
> -PORTREVISION=  1
> +PORTREVISION=  2
>  CATEGORIES=    x11-toolkits graphics
>  PKGNAMEPREFIX= qt5-
>
>