From: Peter Seiderer Date: Mon, 13 Feb 2017 23:34:55 +0100 Subject: [Buildroot] [PATCH v2 2/2] qt5base: make harfbuzz support selectable In-Reply-To: <20170213223455.9915-1-ps.report@gmx.net> References: <20170213223455.9915-1-ps.report@gmx.net> Message-ID: <20170213223455.9915-2-ps.report@gmx.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net If selected use: - system/buildroot harfbuzz in case __sync for 4 bytes is supported - qt harfbuzz otherwise (using QAtomic instead) Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - make harfbuzz support selectable, preferre the system provided one, but fall back to qt provided one --- package/qt5/qt5base/Config.in | 9 +++++++++ package/qt5/qt5base/qt5base.mk | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 337dcf245..27f225026 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -239,6 +239,15 @@ config BR2_PACKAGE_QT5BASE_FONTCONFIG This option enables Fontconfig and Freetype support using the system fontconfig and freetype2 libraries. +config BR2_PACKAGE_QT5BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if BR2_TOOLCHAIN_HAS_SYNC_4 + help + This option enables HarfBuzz support (either system + harfbuzz if the toolchain supports __sync for 4 bytes + or qt provided one which avoids this dependenc by using + QAtomic). + config BR2_PACKAGE_QT5BASE_GIF bool "GIF support" help diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 3825f5bcc..187388e19 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -105,6 +105,20 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) QT5BASE_CONFIGURE_OPTS += -I$(STAGING_DIR)/usr/include/freetype2 endif QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_GUI),freetype) +ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_HARFBUZZ),yy) +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT5BASE_CONFIGURE_OPTS += -system-harfbuzz +QT5BASE_DEPENDENCIES += harfbuzz +else +# qt harfbuzz otherwise (using QAtomic instead) +QT5BASE_CONFIGURE_OPTS += -qt-harfbuzz +QT5BASE_LICENSE := $(QT5BASE_LICENSE), MIT (harfbuzz) +QT5BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT5BASE_CONFIGURE_OPTS += -no-harfbuzz +endif QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) -- 2.11.0