From patchwork Thu Dec 22 14:21:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Naumann X-Patchwork-Id: 708234 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tktxz1m4Wz9t0w for ; Fri, 23 Dec 2016 01:21:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B8229860D3; Thu, 22 Dec 2016 14:21:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fP9E7e3sGAGG; Thu, 22 Dec 2016 14:21:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1E60685D44; Thu, 22 Dec 2016 14:21:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 81B0E1C0A63 for ; Thu, 22 Dec 2016 14:21:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7ABB4862F7 for ; Thu, 22 Dec 2016 14:21:44 +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 6_yCxL-R2dxJ for ; Thu, 22 Dec 2016 14:21:42 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 9DA088507A for ; Thu, 22 Dec 2016 14:21:42 +0000 (UTC) Received: from localhost.localdomain (unknown [145.129.136.115]) by dd5424.kasserver.com (Postfix) with ESMTPA id 670AAB5836E8; Thu, 22 Dec 2016 15:21:40 +0100 (CET) From: Andreas Naumann To: buildroot@buildroot.org, ps.report@gmx.net, thomas.petazzoni@free-electrons.com Date: Thu, 22 Dec 2016 15:21:10 +0100 Message-Id: <1482416476-20306-5-git-send-email-anaumann@ultratronik.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1482416476-20306-1-git-send-email-anaumann@ultratronik.de> References: <1482416476-20306-1-git-send-email-anaumann@ultratronik.de> Cc: Andreas Naumann Subject: [Buildroot] [PATCH v4 04/10] Revert "qt5base: install bundled fonts to target" X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Julien Corjon qtbase carries nor more fonts since c5ceabb9a1caf6b9b7615a28c3097f221772f645 This reverts commit cdfa21b06041eb601e0bea79f2c8f50e9d637384 and part of 186ef9f6f4647ed34b67a3427a5e0e249f0794e7 Signed-off-by: Andreas Naumann Signed-off-by: Julien Corjon --- package/qt5/qt5base/qt5base.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index a44fbe3..6bca17c 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -230,14 +230,6 @@ define QT5BASE_INSTALL_TARGET_PLUGINS done endef -define QT5BASE_INSTALL_TARGET_FONTS - if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \ - fi -endef - - define QT5BASE_INSTALL_TARGET_EXAMPLES example_dirs=$$(cd $(@D)/examples; find . -mindepth 1 -maxdepth 1 -type d); \ for example in $${example_dirs}; do \ @@ -250,14 +242,12 @@ endef ifeq ($(BR2_STATIC_LIBS),y) define QT5BASE_INSTALL_TARGET_CMDS - $(QT5BASE_INSTALL_TARGET_FONTS) $(QT5BASE_INSTALL_TARGET_EXAMPLES) endef else define QT5BASE_INSTALL_TARGET_CMDS $(QT5BASE_INSTALL_TARGET_LIBS) $(QT5BASE_INSTALL_TARGET_PLUGINS) - $(QT5BASE_INSTALL_TARGET_FONTS) $(QT5BASE_INSTALL_TARGET_EXAMPLES) endef endif