qt5: Fix build on GCC based architectures.

PR:		231584
PR:		231677
PR:		231685
PR:		231830
PR:		231955
PR:		231905
PR:		231892
PR:		231684
PR:		231958
PR:		231960
PR:		231818
PR:		231542
PR:		231860
PR:		231681
PR:		231963
PR:		231891
PR:		231966
PR:		231904
PR:		231676
PR:		231819
PR:		231956
PR:		231680
PR:		231957
PR:		231903
PR:		231901
PR:		231667
PR:		231861
Submitted by:	 Piotr Kubaj <pkubaj@anongoth.pl>
This commit is contained in:
Tobias C. Berner 2018-10-14 08:01:13 +00:00
parent 1ff1600008
commit d19d17bd64
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=482034
41 changed files with 83 additions and 45 deletions

View file

@ -196,6 +196,11 @@ _EXTRA_PATCHES_QT4+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-aarch64
_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
. 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
USE_GCC= yes
. endif
. endif
EXTRA_PATCHES?= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \
${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}
@ -268,6 +273,14 @@ _QT_TOOLS+= ${UIC}
# other QtBase ports. See below.
_QT5_BASE= core dbus gui network sql widgets
.if ${_QT_VER:M5}
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}|' ${WRKSRC}/mkspecs/common/gcc-base.conf \
${WRKSRC}/mkspecs/common/g++-base.conf
.endif
pre-configure: qtbase-pre-configure
qtbase-pre-configure:
. for tool in ${_QT_TOOLS}

View file

@ -10,7 +10,7 @@ COMMENT= Accessibilty features for Qt5
LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher
USES= pkgconfig qmake:outsource qt-dist:5,speech
USES= compiler:c++11-lang pkgconfig qmake:outsource qt-dist:5,speech
USE_QT= core gui buildtools_build qmake_build
.include <bsd.port.mk>

View file

@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt sensors module
USE_QT= core qml quick buildtools_build
USES= qmake:norecursive qt-dist:5,sensors
USES= compiler:c++11-lang qmake:norecursive qt-dist:5,sensors
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

View file

@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt functions to access serial ports
USE_QT= core buildtools_build
USES= qmake qt-dist:5,serialport
USES= compiler:c++11-lang libtool qmake qt-dist:5,serialport
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SQL database integration module
USES= qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb

View file

@ -10,7 +10,7 @@ COMMENT= Qt 5 documentation browser
USE_QT= core gui help network printsupport sql widgets \
buildtools_build sql-sqlite3_run
USES= qmake qt-dist:5,tools
USES= compiler:c++11-lang qmake qt-dist:5,tools
DESKTOP_ENTRIES="Qt 5 Assistant" "" \
"${PREFIX}/share/pixmaps/assistant-qt5.png" \

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt build tools
USES= perl5 qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang libtool perl5 qmake:no_env qt-dist:5,base
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt multi-threading module
USES= qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb

View file

@ -11,7 +11,7 @@ COMMENT= Qt core non-graphical module
LIB_DEPENDS= libicui18n.so:devel/icu \
libpcre2-posix.so:devel/pcre2
USES= qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang gnome qmake:no_env qt-dist:5,base
USE_GNOME= glib20
USE_QT= qmake_build buildtools_build
HAS_CONFIGURE= yes

View file

@ -10,7 +10,7 @@ COMMENT= Qt D-Bus inter-process communication module
LIB_DEPENDS= libdbus-1.so:devel/dbus
USES= qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb

View file

@ -10,7 +10,7 @@ COMMENT= Qt 5 graphical user interface designer
USE_QT= assistant_run core gui network printsupport quick uiplugin \
widgets xml buildtools_build
USES= qmake qt-dist:5,tools
USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
DESKTOP_ENTRIES="Qt 5 Designer" "" \

View file

@ -10,7 +10,7 @@ COMMENT= Qt online help integration module
USE_QT= core gui network sql widgets \
buildtools_build sql-sqlite3_run
USES= qmake qt-dist:5,tools
USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/assistant

View file

@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt localization tools
USE_QT= core xml buildtools_build qml_build
USES= qmake qt-dist:5,tools
USES= compiler:c++11-lang qmake qt-dist:5,tools
BUILD_WRKSRC= ${WRKSRC}/src/linguist
INSTALL_WRKSRC= ${WRKSRC}/src/linguist

View file

@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt location module
USE_QT= concurrent core dbus gui network qml quick buildtools_build
USES= qmake:norecursive qt-dist:5,location
USES= compiler:c++11-lang qmake:norecursive qt-dist:5,location
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt command-line interface to D-Bus
USES= qmake qt-dist:5,tools
USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_QT= core dbus xml buildtools_build
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}/${PORTNAME}

View file

@ -30,8 +30,6 @@ CONFIGURE_ARGS= -no-accessibility -no-openssl -no-gui -no-cups \
QMAKESPEC= freebsd-${QMAKE_COMPILER}
INSTALL_TARGET= sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
BROKEN_powerpc64= fails to compile: error: unrecognized command line option -std=c++11
BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}
post-patch:

View file

@ -8,10 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 4-compatible scripting module
BROKEN_powerpc64= Does not build
USE_QT= core buildtools_build
USES= qmake qt-dist:5,script
USES= compiler:c++11-lang qmake qt-dist:5,script
# Keep make(1) from descending into src/script/obj/ (qmake:outsource
# doesn't work).
MAKE_ENV= MAKEOBJDIR=.

View file

@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Script additional components
USE_QT= core gui script widgets buildtools_build
USES= qmake qt-dist:5,script
USES= compiler:c++11-lang qmake qt-dist:5,script
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt unit testing module
USES= qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb

View file

@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt Designer UI forms support module
USE_QT= core gui uiplugin widgets buildtools_build
USES= qmake qt-dist:5,tools
USES= compiler:c++11-lang qmake qt-dist:5,tools
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/designer/src/${PORTNAME}

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX?= qt5-sqldrivers-
MAINTAINER?= kde@FreeBSD.org
COMMENT?= Qt ${DB_DESC} database plugin
USES+= qmake:no_env qt-dist:5,base
USES+= compiler:c++11-lang qmake:no_env qt-dist:5,base
USE_QT+= core sql qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS+=-no-gui -no-xcb

View file

@ -0,0 +1,20 @@
--- mkspecs/common/g++-base.conf.orig 2018-09-21 12:02:35 UTC
+++ mkspecs/common/g++-base.conf
@@ -8,14 +8,14 @@
# you can use the manual test in tests/manual/mkspecs.
#
-QMAKE_COMPILER = gcc
+QMAKE_COMPILER = gcc%%GCC_DEFAULT%%
-QMAKE_CC = gcc
+QMAKE_CC = gcc%%GCC_DEFAULT%%
QMAKE_LINK_C = $$QMAKE_CC
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
-QMAKE_CXX = g++
+QMAKE_CXX = g++%%GCC_DEFAULT%%
QMAKE_LINK = $$QMAKE_CXX
QMAKE_LINK_SHLIB = $$QMAKE_CXX

View file

@ -0,0 +1,11 @@
--- mkspecs/common/gcc-base.conf.orig 2018-09-21 12:20:28 UTC
+++ mkspecs/common/gcc-base.conf
@@ -73,7 +73,7 @@ QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG
QMAKE_CXXFLAGS_LTCG_FATOBJECTS = $$QMAKE_CFLAGS_LTCG_FATOBJECTS
QMAKE_CXXFLAGS_DISABLE_LTCG = $$QMAKE_CFLAGS_DISABLE_LTCG
-QMAKE_LFLAGS +=
+QMAKE_LFLAGS += -Wl,-rpath=%%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%
QMAKE_LFLAGS_DEBUG +=
QMAKE_LFLAGS_APP +=
QMAKE_LFLAGS_RELEASE +=

View file

@ -14,6 +14,6 @@ LIB_DEPENDS= libjasper.so:graphics/jasper \
libwebp.so:graphics/webp
USE_QT= core gui buildtools_build
USES= localbase qmake qt-dist:5,imageformats
USES= compiler:c++11-lang localbase qmake qt-dist:5,imageformats
.include <bsd.port.mk>

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5-compatible OpenGL support module
USES= qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang gl qmake:no_env qt-dist:5,base
USE_GL= gl
USE_QT= core gui widgets qmake_build buildtools_build
HAS_CONFIGURE= yes

View file

@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG support module
USE_QT= core gui widgets buildtools_build
USES= qmake qt-dist:5,svg
USES= compiler:c++11-lang qmake qt-dist:5,svg
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>

View file

@ -8,10 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt QML and JavaScript language module
BROKEN_powerpc64= Does not build
USE_QT= core network buildtools_build
USES= python:build qmake qt-dist:5,declarative
USES= compiler:c++11-lang python:build qmake qt-dist:5,declarative
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src

View file

@ -11,7 +11,8 @@ COMMENT= Qt audio, video, radio and camera support module
# LICENSE set via USES_QT5 (bsd.qt.mk)
USES= pkgconfig qmake:norecursive qt-dist:5,multimedia
USES= compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \
qt-dist:5,multimedia
USE_GL= gl
USE_GNOME= glib20
USE_QT= core gui network opengl qml quick widgets \

View file

@ -13,7 +13,7 @@ BROKEN_SSL_REASON_openssl-devel= error: member access into incomplete type 'X509
RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
USES= qmake:no_env qt-dist:5,base ssl
USES= compiler:c++11-lang qmake:no_env qt-dist:5,base ssl
USE_QT= core buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt print support module
USES= qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
USE_QT= core gui widgets qmake_build buildtools_build
HAS_CONFIGURE= yes
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Command line client to QStandardPaths
USES= qmake:outsource qt-dist:5,tools
USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools
USE_QT= core
PLIST_FILES= ${QT_BINDIR}/qtpaths

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SAX and DOM implementations
USES= qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
USE_QT= core qmake_build buildtools_build
HAS_CONFIGURE= yes
CONFIGURE_ARGS= -no-gui -no-xcb

View file

@ -8,10 +8,8 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt support for XPath, XQuery, XSLT and XML Schema
BROKEN_powerpc64= Does not build
USE_QT= core network buildtools_build
USES= qmake:norecursive qt-dist:5,xmlpatterns
USES= compiler:c++11-lang qmake:norecursive qt-dist:5,xmlpatterns
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>

View file

@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt 5 library for integration of C++/QML with HTML/js clients
USE_QT= buildtools_build core qml quick
USES= qmake:norecursive qt-dist:5,webchannel
USES= compiler:c++11-lang qmake:norecursive qt-dist:5,webchannel
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
# The default EXTRACT_AFTER_ARGS value excludes examples/ from the extracted

View file

@ -22,7 +22,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= xdg-open:devel/xdg-utils
USES= jpeg localbase qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang jpeg localbase qmake:no_env qt-dist:5,base
USE_GL= gl egl
USE_GNOME= glib20
USE_QT= core dbus network qmake_build buildtools_build

View file

@ -11,7 +11,8 @@ COMMENT= Qt declarative framework for dynamic user interfaces
USE_GL= gl
USE_QT= core gui network qml sql testlib \
widgets xmlpatterns buildtools_build
USES= python:build qmake:norecursive qt-dist:5,declarative
USES= compiler:c++11-lang gl python:build qmake:norecursive \
qt-dist:5,declarative
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
CONFLICTS= qt5-declarative-render2d-*

View file

@ -10,7 +10,7 @@ COMMENT= Set of controls for building complete interfaces in Qt Quick
BROKEN_armv6= fails to install: pkg-static: Unable to access file ApplicationWindow.qmlc: No such file or directory
USES= qmake qt-dist:5,quickcontrols
USES= compiler:c++11-lang qmake qt-dist:5,quickcontrols
USE_QT= core gui qml quick widgets \
buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

View file

@ -10,7 +10,7 @@ COMMENT= Set of controls for building complete interfaces in Qt Quick
BROKEN_armv6= fails to install: pkg-static: Unable to access file DayOfWeekRow.qmlc: No such file or directory
USES= qmake:norecursive qt-dist:5
USES= compiler:c++11-lang qmake:norecursive qt-dist:5
USE_QT= core gui qml quick widgets \
buildtools_build
QT_DIST= ${PORTNAME}

View file

@ -10,7 +10,7 @@ COMMENT= Qt 5 Virtual Keyboard Module
LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell
USES= qmake qt-dist:5,virtualkeyboard
USES= compiler:c++11-lang qmake qt-dist:5,virtualkeyboard
USE_QT= core network gui widgets svg qml quick buildtools_build
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

View file

@ -8,7 +8,7 @@ PKGNAMEPREFIX= qt5-
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt C++ widgets module
USES= qmake:no_env qt-dist:5,base
USES= compiler:c++11-lang qmake:no_env qt-dist:5,base
USE_QT= core gui qmake_build buildtools_build
USE_XORG= x11
HAS_CONFIGURE= yes

View file

@ -9,7 +9,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt platform-specific features for X11-based systems
USE_QT= core gui
USES= qmake qt-dist:5,x11extras
USES= compiler:c++11-lang qmake qt-dist:5,x11extras
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
.include <bsd.port.mk>