1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: add support for GNU/Hurd

Browse Source 
Add a "HURD" CMake platform specification, so it can be properly
checked in the build system.

Set QT_DEFAULT_MKSPEC to the existing hurd-g++ mkspec.

Hurd supports $ORIGIN in RPATH, so enable it.

Hurd uses X11, so add it to the X11_SUPPORTED list.

Enable few more feature checks that apply to Hurd as well: either
because they are provided by GNU libc itself, or because they are
implemented on Hurd.

Check and set the ELF interpreter, as it is a common functionality of
the GNU toolchain.

Change-Id: Id347033560bbc5a2a4e2c3abb493c948c002b40e
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Pino Toscano 2021-11-21 08:59:56 +01:00
parent 6e5c7b9e4f
commit 099e0fff61
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtBuild.cmake
View File

@ -362,6 +362,8 @@ elseif(SOLARIS)
set(QT_DEFAULT_MKSPEC solaris-cc) set(QT_DEFAULT_MKSPEC solaris-cc)
endif() endif()
endif() endif()
elseif(HURD)
set(QT_DEFAULT_MKSPEC hurd-g++)
endif() endif()
if(NOT QT_QMAKE_TARGET_MKSPEC) if(NOT QT_QMAKE_TARGET_MKSPEC)

1
cmake/QtPlatformSupport.cmake
View File

@ -18,6 +18,7 @@ qt_set01(FREEBSD CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") # FIXME: How to identify
qt_set01(NETBSD CMAKE_SYSTEM_NAME STREQUAL "NetBSD") # FIXME: How to identify this? qt_set01(NETBSD CMAKE_SYSTEM_NAME STREQUAL "NetBSD") # FIXME: How to identify this?
qt_set01(WASM CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR EMSCRIPTEN) qt_set01(WASM CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR EMSCRIPTEN)
qt_set01(SOLARIS CMAKE_SYSTEM_NAME STREQUAL "SunOS") qt_set01(SOLARIS CMAKE_SYSTEM_NAME STREQUAL "SunOS")
qt_set01(HURD CMAKE_SYSTEM_NAME STREQUAL "GNU")
qt_set01(BSD APPLE OR OPENBSD OR FREEBSD OR NETBSD) qt_set01(BSD APPLE OR OPENBSD OR FREEBSD OR NETBSD)

2
cmake/QtRpathHelpers.cmake
View File

@ -20,7 +20,7 @@ function(qt_compute_relative_rpath_base rpath install_location out_var)
# needed in the .prf files, but for CMake we need to prepend them ourselves. # needed in the .prf files, but for CMake we need to prepend them ourselves.
if(APPLE) if(APPLE)
set(rpath_rel_base "@loader_path") set(rpath_rel_base "@loader_path")
elseif(LINUX OR SOLARIS OR FREEBSD) elseif(LINUX OR SOLARIS OR FREEBSD OR HURD)
set(rpath_rel_base "$ORIGIN") set(rpath_rel_base "$ORIGIN")
else() else()
message(WARNING "No known RPATH_REL_BASE for target platform.") message(WARNING "No known RPATH_REL_BASE for target platform.")

2
src/corelib/CMakeLists.txt
View File

@ -339,7 +339,7 @@ set_property(TARGET Core APPEND PROPERTY
PRIVATE_HEADER "${CMAKE_CURRENT_BINARY_DIR}/global/qconfig_p.h") PRIVATE_HEADER "${CMAKE_CURRENT_BINARY_DIR}/global/qconfig_p.h")
# Find ELF interpreter and define a macro for that: # Find ELF interpreter and define a macro for that:
if (LINUX AND NOT CMAKE_CROSSCOMPILING AND BUILD_SHARED_LIBS) if ((LINUX OR HURD) AND NOT CMAKE_CROSSCOMPILING AND BUILD_SHARED_LIBS)
if (NOT DEFINED ELF_INTERPRETER) if (NOT DEFINED ELF_INTERPRETER)
execute_process(COMMAND ${CMAKE_COMMAND} -E env LC_ALL=C readelf -l /bin/ls execute_process(COMMAND ${CMAKE_COMMAND} -E env LC_ALL=C readelf -l /bin/ls
RESULT_VARIABLE readelf_ok RESULT_VARIABLE readelf_ok

8
src/corelib/configure.cmake
View File

@ -578,7 +578,7 @@ qt_feature("glib" PUBLIC PRIVATE
qt_feature_definition("glib" "QT_NO_GLIB" NEGATE VALUE "1") qt_feature_definition("glib" "QT_NO_GLIB" NEGATE VALUE "1")
qt_feature("glibc" PRIVATE qt_feature("glibc" PRIVATE
LABEL "GNU libc" LABEL "GNU libc"
AUTODETECT LINUX AUTODETECT ( LINUX OR HURD )
CONDITION TEST_glibc CONDITION TEST_glibc
) )
qt_feature("icu" PRIVATE qt_feature("icu" PRIVATE
@ -612,7 +612,7 @@ qt_feature("system-libb2" PRIVATE
# Currently only used by QTemporaryFile; linkat() exists on Android, but hardlink creation fails due to security rules # Currently only used by QTemporaryFile; linkat() exists on Android, but hardlink creation fails due to security rules
qt_feature("linkat" PRIVATE qt_feature("linkat" PRIVATE
LABEL "linkat()" LABEL "linkat()"
AUTODETECT LINUX AND NOT ANDROID AUTODETECT ( LINUX AND NOT ANDROID ) OR HURD
CONDITION TEST_linkat CONDITION TEST_linkat
) )
qt_feature("std-atomic64" PUBLIC qt_feature("std-atomic64" PUBLIC
@ -669,7 +669,7 @@ qt_feature("qqnx_pps" PRIVATE
) )
qt_feature("renameat2" PRIVATE qt_feature("renameat2" PRIVATE
LABEL "renameat2()" LABEL "renameat2()"
CONDITION LINUX AND TEST_renameat2 CONDITION ( LINUX OR HURD ) AND TEST_renameat2
) )
qt_feature("slog2" PRIVATE qt_feature("slog2" PRIVATE
LABEL "slog2" LABEL "slog2"
@ -677,7 +677,7 @@ qt_feature("slog2" PRIVATE
) )
qt_feature("statx" PRIVATE qt_feature("statx" PRIVATE
LABEL "statx() in libc" LABEL "statx() in libc"
CONDITION LINUX AND TEST_statx CONDITION ( LINUX OR HURD ) AND TEST_statx
) )
qt_feature("syslog" PRIVATE qt_feature("syslog" PRIVATE
LABEL "syslog" LABEL "syslog"

2
src/gui/configure.cmake
View File

@ -25,7 +25,7 @@ set_property(CACHE INPUT_libpng PROPERTY STRINGS undefined no qt system)
#### Libraries #### Libraries
qt_set01(X11_SUPPORTED LINUX OR HPUX OR FREEBSD OR NETBSD OR OPENBSD OR SOLARIS) # special case qt_set01(X11_SUPPORTED LINUX OR HPUX OR FREEBSD OR NETBSD OR OPENBSD OR SOLARIS OR HURD) # special case
qt_find_package(ATSPI2 PROVIDED_TARGETS PkgConfig::ATSPI2 MODULE_NAME gui QMAKE_LIB atspi) qt_find_package(ATSPI2 PROVIDED_TARGETS PkgConfig::ATSPI2 MODULE_NAME gui QMAKE_LIB atspi)
qt_find_package(DirectFB PROVIDED_TARGETS PkgConfig::DirectFB MODULE_NAME gui QMAKE_LIB directfb) qt_find_package(DirectFB PROVIDED_TARGETS PkgConfig::DirectFB MODULE_NAME gui QMAKE_LIB directfb)
qt_find_package(Libdrm PROVIDED_TARGETS Libdrm::Libdrm MODULE_NAME gui QMAKE_LIB drm) qt_find_package(Libdrm PROVIDED_TARGETS Libdrm::Libdrm MODULE_NAME gui QMAKE_LIB drm)