diff options
| -rw-r--r-- | package/qt5/Config.in | 5 | ||||
| -rw-r--r-- | package/qt5/qt5base/qt5base.mk | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/package/qt5/Config.in b/package/qt5/Config.in index 3fb65f7c34..22fd0c0809 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -11,15 +11,16 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on !BR2_ARM_CPU_ARMV4 default y -comment "Qt5 needs a toolchain w/ wchar, NPTL, C++" +comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" depends on !BR2_PACKAGE_QT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS menuconfig BR2_PACKAGE_QT5 bool "Qt5" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_STATIC_LIBS depends on !BR2_PACKAGE_QT select BR2_PACKAGE_QT5BASE help diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index e80c20c638..e783b4d42e 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -26,7 +26,8 @@ QT5BASE_CONFIGURE_OPTS += \ -no-iconv \ -system-zlib \ -system-pcre \ - -no-pch + -no-pch \ + -shared ifeq ($(BR2_ENABLE_DEBUG),y) QT5BASE_CONFIGURE_OPTS += -debug @@ -34,14 +35,6 @@ else QT5BASE_CONFIGURE_OPTS += -release endif -ifeq ($(BR2_STATIC_LIBS),y) -QT5BASE_CONFIGURE_OPTS += -static -else -# We apparently can't build both the shared and static variants of the -# library. -QT5BASE_CONFIGURE_OPTS += -shared -endif - QT5BASE_CONFIGURE_OPTS += -largefile ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) |
