Attachment 163783 Details for Bug 204975 – Patch v1

[patch] Patch v1

bsd.qt.mk-qtnonstandard-phase-v1.patch (text/plain), 1.32 KB, created by Raphael Kubo da Costa on 2015-12-02 20:31:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2015-12-02 20:31:07 UTC

Size: 1.32 KB

patch

obsolete

>Index: Mk/bsd.qt.mk
>===================================================================
>--- Mk/bsd.qt.mk	(revision 402844)
>+++ Mk/bsd.qt.mk	(working copy)
>@@ -208,16 +208,6 @@
> 				FULLVER=${_QT_VERSION:C/-.*//}
> .endif # defined(QT_DIST)
> 
>-.if !defined(QT_NONSTANDARD)
>-CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
>-				MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
>-				QMAKESPEC="${QMAKESPEC}"
>-CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
>-				--with-qt-libraries=${QT_LIBDIR} \
>-				--with-extra-includes=${LOCALBASE}/include \
>-				--with-extra-libs=${LOCALBASE}/lib
>-.endif # !defined(QT_NONSTANDARD)
>-
> .if ${_QT_VERSION:M4*}
> QT_BINDIR_REL?=	bin
> QT_LIBDIR_REL?=	lib/${_QT_RELNAME}
>@@ -287,6 +277,16 @@
> 
> Qt_Post_Include=	bsd.qt.mk
> 
>+.if !defined(QT_NONSTANDARD)
>+CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
>+				MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
>+				QMAKESPEC="${QMAKESPEC}"
>+CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
>+				--with-qt-libraries=${QT_LIBDIR} \
>+				--with-extra-includes=${LOCALBASE}/include \
>+				--with-extra-libs=${LOCALBASE}/lib
>+.endif # !defined(QT_NONSTANDARD)
>+
> _USE_QT_ALL=	assistant clucene dbus declarative designer gui help \
> 				imageformats linguist linguisttools multimedia network opengl pixeltool \
> 				qdbusviewer qmake script scripttools sql sql-ibase sql-mysql \

Actions: View | Diff

Attachments on bug 204975: 163783