From patchwork Wed May 17 21:15:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 763762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wSnD31F2lz9s4q for ; Thu, 18 May 2017 07:15:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HZSWNjlu"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D4D1530339; Wed, 17 May 2017 21:15:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id diSzbZbvLQX2; Wed, 17 May 2017 21:15:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7D6DC24FAE; Wed, 17 May 2017 21:15:39 +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 937541C0E4A for ; Wed, 17 May 2017 21:15:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8E99888EB1 for ; Wed, 17 May 2017 21:15:35 +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 wu4WPvfWhre0 for ; Wed, 17 May 2017 21:15:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7466188EA1 for ; Wed, 17 May 2017 21:15:34 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id d127so6527800wmf.1 for ; Wed, 17 May 2017 14:15:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Bx0KPIsSqVgHoS+OCzAzs2Vdk3IJDWrchu76KEsu0k0=; b=HZSWNjlu85c9/Bqf9ibX1l5EAo+hHcyIAGWq4V5eRSGEYp/8M7Du9+2IMnOkR2uace p94uHlTfEVaRETtJOcryHmqo9RmKaSbEOVwWK05+JqXkA6MN5ejrLDRfS3y2+24Wi17o MgJg2A8d53sgk75fCjkQj6SECYLsCEhGlhblRJRPGrc3+03701/uFJFKcXGdt09fuKOY bK4TinexlIerTk7tggXKJAE7Ow0yYL0vq++g0GL1oTtsg+3ubAZ0P2PB3P3CSE7UZ4VO pU+sksJcBMG4zUgjxQoWvp3levixcsBYR9w+ksR1qcMxXhPn5akQOurjK2MJZ8GkWxwK 1ouA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Bx0KPIsSqVgHoS+OCzAzs2Vdk3IJDWrchu76KEsu0k0=; b=Gu/Ivu4cwmXCIKn/u0LtmkFdra0mHdl6MUfKjPj4drtpQssP6fQx7yI2spBxEqeiZ3 S6QEH1EK68qj0X4c6uRhs0GWhcpB6XraJPPfP0mScFWfeyZdqx4jJkBbTV0hdAYNreyo MUJrPXLjxaBkr/6KWrT69isx4SMa1Bg2UxVKEL/LEqzouDTQ88eFCHi0CoduFFMHiFlh ECSh6WXbWZgtXXcKruVp/V/Wvt+8mu/dr8pOZFQPBslJ2ozPm56HTxnRFWma/frsv2VJ qEYwTgkNZLqz9acrRIPGLvMyR7HBuXwSBuTrErUaVDw8Ja/xoiV10eTQn7GyD4bpVW0W 4vUw== X-Gm-Message-State: AODbwcD9u0TCe/rbtJjyc70KzCmW0FTr0WW6XDsBFaIU73kTO0MOTTF6 uyZvnWzfDkVOSg== X-Received: by 10.28.184.85 with SMTP id i82mr534177wmf.64.1495055732818; Wed, 17 May 2017 14:15:32 -0700 (PDT) Received: from localhost.localdomain (2a01cb0886107300a556795e0851f8aa.ipv6.abo.wanadoo.fr. [2a01:cb08:8610:7300:a556:795e:851:f8aa]) by smtp.gmail.com with ESMTPSA id y60sm3465167wrb.39.2017.05.17.14.15.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 May 2017 14:15:31 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Wed, 17 May 2017 23:15:28 +0200 Message-Id: <79662cee8b26cb83d7c7e76effcdf5a217112d82.1495055675.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: Cc: Peter Seiderer , "Yann E. MORIN" Subject: [Buildroot] [PATCH 1/2 v2] package/qt5base: install arch-specific configuration 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" For some architectures, it is necessary to link with additional libraries, such as -latomic for sparc. Add a bit of support to make that easy; actual use will be introduced in the following patch. Signed-off-by: "Yann E. MORIN" Cc: Julien Corjon Cc: Peter Seiderer Tested-by: Bernd Kuhls --- Changes v1 -> v2: - rename macro --- package/qt5/qt5base/qmake.conf | 3 +++ package/qt5/qt5base/qt5base.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf index 49cf898316..8b6debe583 100644 --- a/package/qt5/qt5base/qmake.conf +++ b/package/qt5/qt5base/qmake.conf @@ -21,5 +21,8 @@ CONFIG += nostrip QMAKE_LIBS += -lrt -lpthread -ldl QMAKE_CFLAGS_ISYSTEM = +# Architecturespecific configuration +include(arch.conf) + include(../common/linux_device_post.conf) load(qt_config) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 0c088350e5..81774b74a6 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -214,12 +214,15 @@ define QT5BASE_CONFIGURE_CONFIG_FILE endef endif +QT5BASE_ARCH_CONFIG_FILE = $(@D)/mkspecs/devices/linux-buildroot-g++/arch.conf define QT5BASE_CONFIGURE_CMDS $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h $(QT5BASE_CONFIGURE_CONFIG_FILE) + touch $(QT5BASE_ARCH_CONFIG_FILE) + $(QT5BASE_CONFIGURE_ARCH_CONFIG) (cd $(@D); \ $(TARGET_MAKE_ENV) \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \