View | Details | Raw Unified | Return to bug 231542 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/qt-dist.mk (+12 lines)
Lines 196-201 Link Here
196
_EXTRA_PATCHES_QT5=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
196
_EXTRA_PATCHES_QT5=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
197
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
197
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
198
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf
198
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf
199
.        if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
200
_EXTRA_PATCHES_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
201
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf
202
.        endif
199
.    endif
203
.    endif
200
EXTRA_PATCHES?=		${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \
204
EXTRA_PATCHES?=		${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \
201
			${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}
205
			${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}
Lines 268-273 Link Here
268
# other QtBase ports. See below.
272
# other QtBase ports. See below.
269
_QT5_BASE=		core dbus gui network sql widgets
273
_QT5_BASE=		core dbus gui network sql widgets
270
274
275
.if ${_QT_VER:M5}
276
post-patch: gcc-post-patch
277
gcc-post-patch:
278
	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/mkspecs/common/gcc-base.conf
279
	${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|' ${WRKSRC}/mkspecs/common/gcc-base.conf
280
	${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|' ${WRKSRC}/mkspecs/common/g++-base.conf
281
.endif
282
271
pre-configure: qtbase-pre-configure
283
pre-configure: qtbase-pre-configure
272
qtbase-pre-configure:
284
qtbase-pre-configure:
273
.      for tool in ${_QT_TOOLS}
285
.      for tool in ${_QT_TOOLS}
(-)devel/qt5/files/extra-patch-mkspecs_common_g++-base.conf (+20 lines)
Line 0 Link Here
1
--- mkspecs/common/g++-base.conf.orig	2018-09-21 12:02:35 UTC
2
+++ mkspecs/common/g++-base.conf
3
@@ -8,14 +8,14 @@
4
 # you can use the manual test in tests/manual/mkspecs.
5
 #
6
 
7
-QMAKE_COMPILER          = gcc
8
+QMAKE_COMPILER          = gcc%%GCC_DEFAULT%%
9
 
10
-QMAKE_CC                = gcc
11
+QMAKE_CC                = gcc%%GCC_DEFAULT%%
12
 
13
 QMAKE_LINK_C            = $$QMAKE_CC
14
 QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
15
 
16
-QMAKE_CXX               = g++
17
+QMAKE_CXX               = g++%%GCC_DEFAULT%%
18
 
19
 QMAKE_LINK              = $$QMAKE_CXX
20
 QMAKE_LINK_SHLIB        = $$QMAKE_CXX
(-)devel/qt5/files/extra-patch-mkspecs_common_gcc-base.conf (+11 lines)
Line 0 Link Here
1
--- mkspecs/common/gcc-base.conf.orig	2018-09-21 12:20:28 UTC
2
+++ mkspecs/common/gcc-base.conf
3
@@ -73,7 +73,7 @@ QMAKE_CXXFLAGS_LTCG        = $$QMAKE_CFLAGS_LTCG
4
 QMAKE_CXXFLAGS_LTCG_FATOBJECTS = $$QMAKE_CFLAGS_LTCG_FATOBJECTS
5
 QMAKE_CXXFLAGS_DISABLE_LTCG   = $$QMAKE_CFLAGS_DISABLE_LTCG
6
 
7
-QMAKE_LFLAGS           +=
8
+QMAKE_LFLAGS           += -Wl,-rpath=%%LOCALBASE%%/lib/gcc%GCC_DEFAULT%%
9
 QMAKE_LFLAGS_DEBUG     +=
10
 QMAKE_LFLAGS_APP       +=
11
 QMAKE_LFLAGS_RELEASE   +=
(-)devel/qt5-qmake/Makefile (-2 lines)
Lines 30-37 Link Here
30
QMAKESPEC=	freebsd-${QMAKE_COMPILER}
30
QMAKESPEC=	freebsd-${QMAKE_COMPILER}
31
INSTALL_TARGET=	sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
31
INSTALL_TARGET=	sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
32
32
33
BROKEN_powerpc64=	fails to compile: error: unrecognized command line option -std=c++11
34
35
BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
33
BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
36
34
37
post-patch:
35
post-patch:

Return to bug 231542