Attachment #204209 for bug #237745

View | Details | Raw Unified | Return to bug 237745
Collapse All | Expand All




.  if ${_QT_DIST} == "base"
_EXTRA_PATCHES_QT5=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf
.        if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
_EXTRA_PATCHES_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf-gcc
USE_GCC=		yes
.else
_EXTRA_PATCHE_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf-clang
.    endif
EXTRA_PATCHES?=		${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \
			${_EXTRA_PATCHES_QT5}




--- mkspecs/common/bsd/bsd.conf.orig    2017-07-23 16:27:40 UTC
+++ mkspecs/common/bsd/bsd.conf
@@ -21,6 +21,27 @@ QMAKE_LIBS_X11          = -lXext -lX11 -lm
 QMAKE_LIBS_OPENGL       = -lGL
 QMAKE_LIBS_THREAD       =

+QMAKE_INCDIR_X11        = %%LOCALBASE%%/include
+QMAKE_LIBDIR_X11        = %%LOCALBASE%%/lib
+QMAKE_INCDIR_OPENGL     = %%LOCALBASE%%/include
+QMAKE_LIBDIR_OPENGL     = %%LOCALBASE%%/lib
+QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+QMAKE_INCDIR_EGL        = %%LOCALBASE%%/include
+QMAKE_LIBDIR_EGL        = %%LOCALBASE%%/lib
+
+QMAKE_LIBS_EGL          = -lEGL
+QMAKE_LIBS_OPENGL_ES2   = -lGLESv2
+QMAKE_LIBS_LIBUDEV      = -ludev
+
+QMAKE_CFLAGS_WAYLAND    =
+QMAKE_INCDIR_WAYLAND    = %%LOCALBASE%%/include
+QMAKE_LIBS_WAYLAND_CLIENT = -lwayland-client
+QMAKE_LIBS_WAYLAND_SERVER = -lwayland-server
+QMAKE_LIBDIR_WAYLAND    = %%LOCALBASE%%/lib
+QMAKE_DEFINES_WAYLAND   =
+QMAKE_WAYLAND_SCANNER   = wayland-scanner
+
 QMAKE_AR                = ar cqs
 QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P

Lines 1-6 Link Here

(-)devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf-gcc (-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++

Lines 1-11 Link Here

(-)devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf (-11 lines)
1	--- mkspecs/freebsd-g++/qmake.conf.orig 2019-04-16 18:13:12 UTC
2	+++ mkspecs/freebsd-g++/qmake.conf
3	@@ -11,6 +11,8 @@ include(../common/bsd/bsd.conf)
4	QMAKE_INCDIR_POST = /usr/local/include
5	QMAKE_LIBDIR_POST = /usr/local/lib
6
7	+EXTRA_INCLUDEPATH += %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include/c++
8	+
9	include(../common/gcc-base-unix.conf)
10	include(../common/g++-unix.conf)
11	load(qt_config)

Return to bug 237745

Lines 169-181 Link Here

(-)Mk/Uses/qt-dist.mk (-2 / +3 lines)
169	. if ${_QT_DIST} == "base"	169	. if ${_QT_DIST} == "base"
170	_EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \	170	_EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
171	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \	171	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
172	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \
173	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf	172	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf
174	. if ${ARCH:Mmips} \|\| ${ARCH:Mpowerpc} \|\| ${ARCH} == sparc64	173	. if ${ARCH:Mmips} \|\| ${ARCH:Mpowerpc} \|\| ${ARCH} == sparc64
175	_EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \	174	_EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
176	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \	175	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
177	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf	176	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf-gcc
178	USE_GCC= yes	177	USE_GCC= yes
		178	.else
		179	_EXTRA_PATCHE_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf-clang
179	. endif	180	. endif
180	EXTRA_PATCHES?= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \	181	EXTRA_PATCHES?= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \
181	${_EXTRA_PATCHES_QT5}	182	${_EXTRA_PATCHES_QT5}