f0a6d45cc8
The qt_poll function calls recv to query whether fds marked by select
as readable should be marked POLLIN or POLLHUP in the pollfd structure.
On many platforms such as QNX this requires extra link-time libraries
which were not previously required by QtCore.
While the qt_poll function is intended as a fallback mechanism only for
those platforms which do not implement poll natively, the function was
compiled unconditionally whenever QT_BUILD_INTERNAL was defined, e.g.
in developer builds.
Additionally the function was included on those systems that define poll
in system headers so that configure determines build-time availability,
but do not define _POSIX_POLL > 0 or indicate POSIX:2008 compliance via
either the _POSIX_VERSION or _XOPEN_VERSION macros. On those systems a
sysconf query for _SC_POLL was performed to determine at runtime whether
to call the system poll or qt_poll.
Both of these cases are in fact counterproductive. In the first case the
sole consumer of the function is a single manual unit test. In the
second, to my knowledge no platform requires the runtime fallback.
Despite that, we were forcing an extra dylib in both cases.
Both cases are fixed by 1) moving the implementation into its own file
for the unit test to include and 2) dropping the dynamic fallback if
configure determines availability of poll at compile-time.
This also reverts commit 1377709711, which
added -lsocket for QtCore on QNX.
Change-Id: I2dd10695c5d4cac81b68d2c2558797f3cdabc153
Reviewed-by: James McDonnell <jmcdonnell@qnx.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
65 lines
2.0 KiB
Plaintext
65 lines
2.0 KiB
Plaintext
#
|
|
# Base qmake configuration for QCC on *nix-systems
|
|
#
|
|
|
|
include(qcc-base.conf)
|
|
|
|
QMAKE_PLATFORM = qnx $$QMAKE_PLATFORM
|
|
|
|
#Choose qnx QPA Plugin as default
|
|
QT_QPA_DEFAULT_PLATFORM = qnx
|
|
|
|
QMAKE_LFLAGS_SHLIB += -shared
|
|
QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
|
|
QMAKE_LFLAGS_SONAME += -Wl,-soname,
|
|
QMAKE_LFLAGS_THREAD +=
|
|
QMAKE_LFLAGS_RPATH = -Wl,-rpath,
|
|
QMAKE_LFLAGS_RPATHLINK = -Wl,-rpath-link,
|
|
|
|
# -Bsymbolic-functions (ld) support
|
|
QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
|
|
QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
|
|
QMAKE_LFLAGS_VERSION_SCRIPT = -Wl,--version-script,
|
|
|
|
# Generic options for all QNX qcc mkspecs
|
|
QMAKE_CFLAGS_THREAD = -D_REENTRANT
|
|
QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
|
|
QMAKE_COMPILER_DEFINES += __QNXNTO__
|
|
|
|
QMAKE_LIBS = -lm
|
|
QMAKE_LIBS_NETWORK = -lsocket
|
|
|
|
# OpenGL libraries have a dependency on libEGL
|
|
QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lEGL
|
|
QMAKE_LIBS_EGL = -lEGL
|
|
|
|
# When using this mkspec to build Qt apps (ie - not Qt itself) we want to build
|
|
# against the NDK's target directory which is referenced by the QNX_TARGET environment
|
|
# variable, and which is guaranteed by the NDK to be set.
|
|
QNX_DIR = $$(QNX_TARGET)
|
|
isEmpty(QNX_DIR) {
|
|
error("QNX_TARGET environment variable not set")
|
|
}
|
|
|
|
QMAKE_INCDIR = $${QNX_DIR}/usr/include $${QNX_DIR}/usr/include/freetype2
|
|
QMAKE_LIBDIR = $${QNX_DIR}/$${QNX_CPUDIR}/lib $${QNX_DIR}/$${QNX_CPUDIR}/usr/lib
|
|
QMAKE_LFLAGS += -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/lib -Wl,-rpath-link,$${QNX_DIR}/$${QNX_CPUDIR}/usr/lib
|
|
|
|
QMAKE_CXXFLAGS_CXX11 = -Wc,-std=gnu++11
|
|
QMAKE_CXXFLAGS_CXX14 = -Wc,-std=gnu++1y
|
|
QMAKE_CXXFLAGS_CXX1Z = -Wc,-std=gnu++1z
|
|
|
|
QMAKE_LINK_C = $$QMAKE_CC
|
|
QMAKE_LINK_C_SHLIB = $$QMAKE_CC
|
|
|
|
QMAKE_LINK = $$QMAKE_CXX
|
|
QMAKE_LINK_SHLIB = $$QMAKE_CXX
|
|
|
|
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
|
|
|
equals(QMAKE_HOST.os, Windows) {
|
|
isEmpty(QMAKE_SH): error("This mkspec requires an MSYS environment.")
|
|
QMAKE_DIR_SEP = /
|
|
QMAKE_DIRLIST_SEP = :
|
|
}
|