From patchwork Thu Mar 14 09:40:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 1056412 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ultratronik.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44KkH54rcCz9s3q for ; Thu, 14 Mar 2019 20:41:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8977F86949; Thu, 14 Mar 2019 09:41:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PfxU4V0HlKC1; Thu, 14 Mar 2019 09:40:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E085586814; Thu, 14 Mar 2019 09:40:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 438651BF30C for ; Thu, 14 Mar 2019 09:40:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 409E287EA7 for ; Thu, 14 Mar 2019 09:40:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8DWK4Y7eAJFl for ; Thu, 14 Mar 2019 09:40:56 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from dd5424.kasserver.com (dd5424.kasserver.com [85.13.138.252]) by hemlock.osuosl.org (Postfix) with ESMTPS id B98A3875D8 for ; Thu, 14 Mar 2019 09:40:56 +0000 (UTC) Received: from wslxew902.fritz.box (ipb21bb577.dynamic.kabel-deutschland.de [178.27.181.119]) by dd5424.kasserver.com (Postfix) with ESMTPA id A40C1B5852F5; Thu, 14 Mar 2019 10:40:53 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org Date: Thu, 14 Mar 2019 10:40:12 +0100 Message-Id: <20190314094024.1961-2-anaumann@ultratronik.de> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190314094024.1961-1-anaumann@ultratronik.de> References: <20190314094024.1961-1-anaumann@ultratronik.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 01/13] qt5base: Do not build shared libs if BR2_STATIC_LIBS is chosen X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: dev@andin.de Cc: Andreas Naumann , Peter Seiderer , =?utf-8?q?Ga=C3=ABl_Portay?= , thomas.petazzoni@bootlin.com Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Traditionlly we configured qt5 to always build shared libraries. This resulted in many conditionals when setting buildroot to static-libs only, because each module's target install had to be guarded. So to avoid this and simplify target install in a subsequent commit, configure qt to build (and install) only the type of libs which the buildroot defconfig is set to. Unfortunately it seems that Qt does not support building both dynamic and static libs at the same time, so we still set it shared if buildroot asks for both. Signed-off-by: Andreas Naumann --- package/qt5/qt5base/qt5base.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index e7f6e658f1..a0492418be 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -24,8 +24,15 @@ QT5BASE_CONFIGURE_OPTS += \ -no-iconv \ -system-zlib \ -system-pcre \ - -no-pch \ - -shared + -no-pch + +ifeq ($(BR2_SHARED_LIBS),y) +QT5BASE_CONFIGURE_OPTS += -shared -no-static +else ifeq ($(BR2_STATIC_LIBS),y) +QT5BASE_CONFIGURE_OPTS += -no-shared -static +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +QT5BASE_CONFIGURE_OPTS += -shared +endif ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) QT5BASE_DEPENDENCIES += pcre