Attachment #202236 for bug #235921




post-patch: gcc-post-patch
gcc-post-patch:
	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/mkspecs/common/gcc-base.conf
	${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' ${WRKSRC}/mkspecs/common/gcc-base.conf \
		${WRKSRC}/mkspecs/common/g++-base.conf ${WRKSRC}/mkspecs/common/bsd/bsd.conf
.endif

pre-configure: qtbase-pre-configure

# occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
# See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
	${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
#	${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
#	${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache
#	${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS = ' >> ${CONFIGURE_WRKSRC}/.qmake.cache
#	${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS = ' >> ${CONFIGURE_WRKSRC}/.qmake.cache
	${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib /usr/lib /lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
	${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache
#	${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/include/c++ ${LOCALBASE}/include /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache

post-install: qt-post-install
qt-post-install:

Lines 1-6 Link Here

(-)devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf (-1 / +3 lines)
1	--- mkspecs/common/bsd/bsd.conf.orig 2017-07-23 16:27:40 UTC	1	--- mkspecs/common/bsd/bsd.conf.orig 2017-07-23 16:27:40 UTC
2	+++ mkspecs/common/bsd/bsd.conf	2	+++ mkspecs/common/bsd/bsd.conf
3	@@ -21,6 +21,27 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm	3	@@ -21,6 +21,29 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm
4	QMAKE_LIBS_OPENGL = -lGL	4	QMAKE_LIBS_OPENGL = -lGL
5	QMAKE_LIBS_THREAD =	5	QMAKE_LIBS_THREAD =
6		6
Lines 28-30 Link Here
28	QMAKE_AR = ar cqs	28	QMAKE_AR = ar cqs
29	QMAKE_OBJCOPY = objcopy	29	QMAKE_OBJCOPY = objcopy
30	QMAKE_NM = nm -P	30	QMAKE_NM = nm -P
		31	+
		32	+EXTRA_INCLUDEPATH += %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include/c++

Return to bug 235921

Lines 277-284 Link Here

(-)Mk/Uses/qt-dist.mk (-4 / +9 lines)
277	post-patch: gcc-post-patch	277	post-patch: gcc-post-patch
278	gcc-post-patch:	278	gcc-post-patch:
279	${REINPLACE_CMD} 's\|%%LOCALBASE%%\|${LOCALBASE}\|' ${WRKSRC}/mkspecs/common/gcc-base.conf	279	${REINPLACE_CMD} 's\|%%LOCALBASE%%\|${LOCALBASE}\|' ${WRKSRC}/mkspecs/common/gcc-base.conf
280	${REINPLACE_CMD} 's\|%%GCC_DEFAULT%%\|${GCC_DEFAULT}\|' ${WRKSRC}/mkspecs/common/gcc-base.conf \	280	${REINPLACE_CMD} 's\|%%GCC_DEFAULT%%\|${GCC_DEFAULT}\|g' ${WRKSRC}/mkspecs/common/gcc-base.conf \
281	${WRKSRC}/mkspecs/common/g++-base.conf	281	${WRKSRC}/mkspecs/common/g++-base.conf ${WRKSRC}/mkspecs/common/bsd/bsd.conf
282	.endif	282	.endif
283		283
284	pre-configure: qtbase-pre-configure	284	pre-configure: qtbase-pre-configure
Lines 348-355 Link Here
348	# occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.	348	# occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
349	# See QTBUG-40825 and ports bugs 194088, 195105 and 198720.	349	# See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
350	${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache	350	${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
351	${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS = ${LOCALBASE}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache	351	# ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
352	${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS = ${LOCALBASE}/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache	352	# ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache
		353	# ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS = ' >> ${CONFIGURE_WRKSRC}/.qmake.cache
		354	# ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS = ' >> ${CONFIGURE_WRKSRC}/.qmake.cache
		355	${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib /usr/lib /lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
		356	${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache
		357	# ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/lib/gcc${GCC_DEFAULT}/include/c++ ${LOCALBASE}/include /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache
353		358
354	post-install: qt-post-install	359	post-install: qt-post-install
355	qt-post-install:	360	qt-post-install: