From patchwork Thu Oct 11 09:57:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lionel Orry X-Patchwork-Id: 982373 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OY9KCbHp"; dkim-atps=neutral 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 42W5yN0SS7z9s3T for ; Thu, 11 Oct 2018 20:58:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C3FE086381; Thu, 11 Oct 2018 09:58:33 +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 66enpQv7BAxb; Thu, 11 Oct 2018 09:58:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1D1F5863CD; Thu, 11 Oct 2018 09:58:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2CE331BF47F for ; Thu, 11 Oct 2018 09:58:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 286EE2151C for ; Thu, 11 Oct 2018 09:58:32 +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 H2FWyWDk+cms for ; Thu, 11 Oct 2018 09:58:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by silver.osuosl.org (Postfix) with ESMTPS id D6B922107F for ; Thu, 11 Oct 2018 09:58:30 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id y144-v6so8669484wmd.4 for ; Thu, 11 Oct 2018 02:58:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mozegIlASr/n/H+fSMgtpINya9qP4/2nblEk9LLJ+gY=; b=OY9KCbHpJMn6FhM71CXyrsoxHsTWy1jrrDY+Kp/+2i+1REQSTIWDr5tfkNNrOd76Dx Uo6I1VYV8bJ5EplBg0DRABFphBbBqKphIThaNhoeH7OMfW11ZaxmSAEV5aZ5XImLz6Q1 3iSq839QM/od3Pwme2YK+kR8kNdBDEI0ENUFuTRRpSDmqrXcWkoxnXjspKG4iY+F0GM7 MzYuziEAcND6IVcd34H8XOPhwimZraGsdmba0MxtZ/woW22sF3vDXv84u39zEjj/7MhJ cm8ZCyz7ufwjrKnablHeObVzOd/JPVbtbWXGN8cdWF7v2fDMmX6dpo3e7xC0YF4/PlEg w3tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mozegIlASr/n/H+fSMgtpINya9qP4/2nblEk9LLJ+gY=; b=kwuNGNChiG8GHlN5nbJ9AKonFPAhXFm89VTWLdlZvD7M75IdE2RpcRR6/MHArn7iF8 liA/30kNnSyCxnkjdGydLqoMEmniC6+8PdPwTvZ9YV3yAY0P00Fl1xr+Gz9+E8PBefsV k/uu0d3UX7M6vs7E4shsv2AiqnGGhNEYihWZJSlhWh83Jh0x1/UjmYyDGwt9L4QIZ7Bi EHfkamiNtfYtL3VPIlrQ298aZ2uLefqxfQ75RM+I7RqfZaWc8EOs3tkKNBf+hFxqMryb iG6wv/CnwlVHlJS5gMQTbhCkONF4mKivtKVsA1O4tGsKBdYF5A8H8waGFAKRDkqNzG5O CKOA== X-Gm-Message-State: ABuFfoj/XQfWODHrn/mpy8jSKfQNo7Yq5Jg1ewgSYhz1BN1kLdcsy+2d PvVNSYdwbEsdtDg1jDOsYKbPcfKq X-Google-Smtp-Source: ACcGV6328GSr0YToVjyy7rkRG9yTT9EM1w1ZRgp9ViuZu4TxizBABNBI/reUlaKQNSUEmG3WBgfw3Q== X-Received: by 2002:a1c:9895:: with SMTP id a143-v6mr1046090wme.43.1539251909100; Thu, 11 Oct 2018 02:58:29 -0700 (PDT) Received: from arch.schneider-electric.com ([165.225.76.75]) by smtp.gmail.com with ESMTPSA id x185-v6sm15335261wmg.12.2018.10.11.02.58.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 02:58:28 -0700 (PDT) From: Lionel Orry To: buildroot@buildroot.org Date: Thu, 11 Oct 2018 11:57:52 +0200 Message-Id: <20181011095755.9188-1-lionel.orry@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/4] pkg-waf: add support for _SUBDIR 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: , Cc: Lionel Orry Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In the Buildroot manual, it is specified that the Waf-based infrastructure supports the _SUBDIR variable, which was not true. This patch: * makes use of this variable by changing to the given sub-directory before executing waf commands, * documents the usage of _SUBDIR in the waf-specific section of the manual. Signed-off-by: Lionel Orry --- Changes v1 -> v2: - remove redundant definition of _SRCDIR definition in pkg-waf.mk - adds _SUBDIR documentation in the waf section of the manual --- docs/manual/adding-packages-waf.txt | 6 ++++++ package/pkg-waf.mk | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/manual/adding-packages-waf.txt b/docs/manual/adding-packages-waf.txt index 43b557c070..208dacc63d 100644 --- a/docs/manual/adding-packages-waf.txt +++ b/docs/manual/adding-packages-waf.txt @@ -60,6 +60,12 @@ the generic infrastructure also exist in the Waf infrastructure: An additional variable, specific to the Waf infrastructure, can also be defined. +* +LIBFOO_SUBDIR+ may contain the name of a subdirectory inside the + package that contains the main wscript file. This is useful, + if for example, the main wscript file is not at the root of + the tree extracted by the tarball. If +HOST_LIBFOO_SUBDIR+ is not + specified, it defaults to +LIBFOO_SUBDIR+. + * +LIBFOO_NEEDS_EXTERNAL_WAF+ can be set to +YES+ or +NO+ to tell Buildroot to use the bundled +waf+ executable. If set to +NO+, the default, then Buildroot will use the waf executable provided in the diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index 3288dd63a0..a32d5dab33 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -60,7 +60,7 @@ $(2)_WAF_OPTS ?= # ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_CONFIGURE_OPTS) \ $$($(2)_CONF_ENV) \ $$(HOST_DIR)/bin/python2 $$($(2)_WAF) configure \ @@ -77,7 +77,7 @@ endif # ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ $$($(2)_WAF_OPTS) @@ -90,7 +90,7 @@ endif # ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ install --destdir=$$(STAGING_DIR) \ $$($(2)_INSTALL_STAGING_OPTS) \ @@ -104,7 +104,7 @@ endif # ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS - cd $$(@D) && \ + cd $$($$(PKG)_SRCDIR) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \ install --destdir=$$(TARGET_DIR) \ $$($(2)_INSTALL_TARGET_OPTS) \ From patchwork Thu Oct 11 09:57:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lionel Orry X-Patchwork-Id: 982375 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kbm5jXKJ"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42W5yV71NZz9sj4 for ; Thu, 11 Oct 2018 20:58:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 174A0871B3; Thu, 11 Oct 2018 09:58:39 +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 dPWXQG10ME8n; Thu, 11 Oct 2018 09:58:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E479886D2F; Thu, 11 Oct 2018 09:58:36 +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 CD5A41BF47F for ; Thu, 11 Oct 2018 09:58:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C880E863CD for ; Thu, 11 Oct 2018 09:58:35 +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 kG2RsfNxVTxs for ; Thu, 11 Oct 2018 09:58:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 0969786A01 for ; Thu, 11 Oct 2018 09:58:35 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id y16so8962831wrw.3 for ; Thu, 11 Oct 2018 02:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YroBttjgXvy9uTCZN90bJZj10xlvLgVU8L9dsFI3APQ=; b=kbm5jXKJ9w2QA+r6AIP9zhYR2mZuVFs0KurBl1EA0p0FSNDE0M+xonFOA+boAvDGMX npPZNfLJRqbfixhVvxvv0JxX13NBo2XmkNcynKfMOmeaZTVa1aoqRiOXFXtd9Ch5p55t H9tDmcELq67n+n0jlLXVX2jrPigHBW3s6jfv6uksFB6Q1noDpZ3fFiTcS0XUQtRy9RzY ET4kbZKpGMIMMjC2KbC2eXPgoFTZrWhOfKRRrWQPw8xmo6vj0c54B432oFUKMIpUv1IZ DUdoFhf4Bg5Ld9FvtJiXdGkecHKEpnqIC6rNshTA8uAOUfNujyZv4kq1OdZz9XhkbXyq 0Ejw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YroBttjgXvy9uTCZN90bJZj10xlvLgVU8L9dsFI3APQ=; b=da/BTr4cYpVZOlJsWDwuSYWVjshn1ekgFcvdMHWdccfnoIuJGqTG9R6EgiF3yhoQxd CUSVG4D0Zy0CR6Tymcw14s3coAuSVl4+he4deuh5e9aHuYmH0NsgM+RTIu7tN/OvWYYm V2RpTeFfWVlCS23XA5s29tjw3S1wUQAnB2sFGsCn4qjZuMhaP7WaEnmG90y7Ws+wfhX/ E/FpqL+gu/8kohsiz0OzMvIfG5VWwl7siC731AOBRlUJwJxRolWBLcI8AlpmWqe42eub +nguoh8pnl0B69rFyT3SckCjpo0GGoQmR8jSuujfEZQU3aTy21a+11QC3RzXz5dbHEkY MxTw== X-Gm-Message-State: ABuFfojZUX1nR3xjRDNFVJPicrqFPnjlqpdBdrWVW4uP30N9zK8xj/Dy 4Uv0OyMvU9GOFSjBbxKHbNezO+Jd X-Google-Smtp-Source: ACcGV60AGO8I3zljwIxfDs7BuVm1yRv8n+qciH/1pObZ17Et2Med84XAxEvAlh0dTfKnSNoJMMqZcg== X-Received: by 2002:a5d:694c:: with SMTP id r12-v6mr869884wrw.170.1539251913290; Thu, 11 Oct 2018 02:58:33 -0700 (PDT) Received: from arch.schneider-electric.com ([165.225.76.75]) by smtp.gmail.com with ESMTPSA id x185-v6sm15335261wmg.12.2018.10.11.02.58.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 02:58:32 -0700 (PDT) From: Lionel Orry To: buildroot@buildroot.org Date: Thu, 11 Oct 2018 11:57:53 +0200 Message-Id: <20181011095755.9188-2-lionel.orry@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181011095755.9188-1-lionel.orry@gmail.com> References: <20181011095755.9188-1-lionel.orry@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/4] pkg-meson: _SUBDIR cleanup 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: , Cc: Lionel Orry Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" No functional change is brought by this modification. This patch: * removes a redundant _SRCDIR declaration (already defined in pkg-generic.mk) * documents the usage of _SUBDIR in the meson-specific section of the manual. Signed-off-by: Lionel Orry --- docs/manual/adding-packages-meson.txt | 6 ++++++ package/pkg-meson.mk | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-packages-meson.txt b/docs/manual/adding-packages-meson.txt index c52fe10506..a0f64ba09e 100644 --- a/docs/manual/adding-packages-meson.txt +++ b/docs/manual/adding-packages-meson.txt @@ -85,6 +85,12 @@ A few additional variables, specific to the Meson infrastructure, can also be defined. Many of them are only useful in very specific cases, typical packages will therefore only use a few of them. +* +FOO_SUBDIR+ may contain the name of a subdirectory inside the + package that contains the main meson.build file. This is useful, + if for example, the main meson.build file is not at the root of + the tree extracted by the tarball. If +HOST_FOO_SUBDIR+ is not + specified, it defaults to +FOO_SUBDIR+. + * +FOO_CONF_ENV+, to specify additional environment variables to pass to +meson+ for the configuration step. By default, empty. diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index 507e686068..5f2955b460 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -48,7 +48,6 @@ define inner-meson-package $(2)_CONF_ENV ?= $(2)_CONF_OPTS ?= $(2)_NINJA_ENV ?= -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) # # Configure step. Only define it if not already defined by the package From patchwork Thu Oct 11 09:57:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lionel Orry X-Patchwork-Id: 982374 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TcPTC3y4"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42W5yV63Z7z9s3T for ; Thu, 11 Oct 2018 20:58:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D58E32107F; Thu, 11 Oct 2018 09:58:40 +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 xlfvXfUorLF9; Thu, 11 Oct 2018 09:58:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A7A0A2151C; Thu, 11 Oct 2018 09:58: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 C24271BF47F for ; Thu, 11 Oct 2018 09:58:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BDDEC87E99 for ; Thu, 11 Oct 2018 09:58:37 +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 GNapDAwExV+4 for ; Thu, 11 Oct 2018 09:58:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by hemlock.osuosl.org (Postfix) with ESMTPS id 3B26487E94 for ; Thu, 11 Oct 2018 09:58:36 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id e4-v6so8978138wrs.0 for ; Thu, 11 Oct 2018 02:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PPPA0EKXm+NXCzpI0XNlctwKuLtmSpbpyYhKjb6bKXw=; b=TcPTC3y47QopCXMhTWBGrX8IqK5QbVkGoJCUXi+7gQIpcq2orgKFfWpFcyWPTvf2uU Qk5SQkFQyAXJ9M56l6F2f0X0/B8Z/yEYj/lbu+QhET/UNg+9uI8ANV4o2lQQkkhfoUPX el1uBWlf2mgebvA/a13X5NEci9c+f7CndNlkD4kGTRsdpbmGrp2GjmtsZUGr26Hwgwam ICUdcPPnrP97wqWiomUrXwMTEd4By1jSnhyMqzDFwVFWfWl5LibVI48KrpeqsKNwvO0V zKoOSD6ODV7kGnm2c8N9hViRPwzD3HPxU2OF9+Maa6/PTWcN1LMAA5sz2bgbMP9RgwPg kaqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PPPA0EKXm+NXCzpI0XNlctwKuLtmSpbpyYhKjb6bKXw=; b=aEH73tnWrwH0gIbKRN16s69WXqywDh6YaTa5knYnLNHuLkFdYjRH/he21uwcIBTHR6 N+7Sb9BcI8C0gs//dd+NPHwhPwSuna896rtMT3wHzA6DHw+sR7XHTm1uIEkHnj+4y1BP 54Bqg7T0L4/sz4m7FrFB5YuE0/HJamyjGnosGfNl2SJ4J5qRKpvXAu3vwjvx6m9VFIgz 7wfv1YU4zA0TI525o1okvf9nW+AZhdz+HE4QIDs+RhYnTqy8brFo1DPi2AWMJc73Q4XJ cMnmGlQ+Hams8PrUguHBU19TZOXLRF22QPSMXHneTsdgWPsF0xZvsNsSwACvLBeyAJA3 xo8g== X-Gm-Message-State: ABuFfoj76w2QaAFocuWmVYYj+BZfWaK+5rVab/hmR9fzXX4WCPr2s4aQ upDM7Mr/q65KXHoT2IToRXuhC/u7 X-Google-Smtp-Source: ACcGV638XXVGqhTujDh9NWTCCrO9aYzU3Ce41VGR3bs/90EEwu8plLRbJnBWvyASzQ/ytXbiBza4wA== X-Received: by 2002:adf:eec4:: with SMTP id a4-v6mr961720wrp.242.1539251914488; Thu, 11 Oct 2018 02:58:34 -0700 (PDT) Received: from arch.schneider-electric.com ([165.225.76.75]) by smtp.gmail.com with ESMTPSA id x185-v6sm15335261wmg.12.2018.10.11.02.58.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 02:58:33 -0700 (PDT) From: Lionel Orry To: buildroot@buildroot.org Date: Thu, 11 Oct 2018 11:57:54 +0200 Message-Id: <20181011095755.9188-3-lionel.orry@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181011095755.9188-1-lionel.orry@gmail.com> References: <20181011095755.9188-1-lionel.orry@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/4] pkg-python: _SUBDIR cleanup 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: , Cc: Lionel Orry Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" No functional change is brought by this modification. This patch: * removes redundant _SRCDIR and _BUILDDIR declarations (already defined in pkg-generic.mk) * documents the usage of _SUBDIR in the python-specific section of the manual. Signed-off-by: Lionel Orry --- docs/manual/adding-packages-python.txt | 6 ++++++ package/pkg-python.mk | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/manual/adding-packages-python.txt b/docs/manual/adding-packages-python.txt index 5eb6ba51b1..15137cfd6d 100644 --- a/docs/manual/adding-packages-python.txt +++ b/docs/manual/adding-packages-python.txt @@ -113,6 +113,12 @@ optionally be defined, depending on the package's needs. Many of them are only useful in very specific cases, typical packages will therefore only use a few of them, or none. +* +PYTHON_FOO_SUBDIR+ may contain the name of a subdirectory inside the + package that contains the main +setup.py+ file. This is useful, + if for example, the main +setup.py+ file is not at the root of + the tree extracted by the tarball. If +HOST_PYTHON_FOO_SUBDIR+ is not + specified, it defaults to +PYTHON_FOO_SUBDIR+. + * +PYTHON_FOO_ENV+, to specify additional environment variables to pass to the Python +setup.py+ script (for both the build and install steps). Note that the infrastructure is automatically passing diff --git a/package/pkg-python.mk b/package/pkg-python.mk index f57e486dad..831bcacfad 100644 --- a/package/pkg-python.mk +++ b/package/pkg-python.mk @@ -101,9 +101,6 @@ HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ define inner-python-package -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) -$(2)_BUILDDIR = $$($(2)_SRCDIR) - $(2)_ENV ?= $(2)_BUILD_OPTS ?= $(2)_INSTALL_OPTS ?= From patchwork Thu Oct 11 09:57:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lionel Orry X-Patchwork-Id: 982376 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EpyIpfSY"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42W5yY2NWKz9s3T for ; Thu, 11 Oct 2018 20:58:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 06C1787EBA; Thu, 11 Oct 2018 09:58:43 +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 f2mgShmfFCJR; Thu, 11 Oct 2018 09:58:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 5DE0787E99; Thu, 11 Oct 2018 09:58:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 978BB1BF47F for ; Thu, 11 Oct 2018 09:58:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 914FF86D91 for ; Thu, 11 Oct 2018 09:58:39 +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 A-Hyp+IS1rhi for ; Thu, 11 Oct 2018 09:58:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7597B870E4 for ; Thu, 11 Oct 2018 09:58:37 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id n11-v6so8860822wru.13 for ; Thu, 11 Oct 2018 02:58:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FgbJxF5/5LFEGqGpel9u7YKfMRyYN1cc0tKnfk8Be2E=; b=EpyIpfSYww+nnn8yco+FO9EZ2h8F5acN5enmX2VyKQNr53P6NXmcjfeij3QQjB6zn0 0AqEfwpqgE+19lkCnv+tJSeNH8FriTXYAWloiicdNITCv9slzfp+BkoH0SnHr4ICuUk9 Zqe8RkZddi/pWklS0HtFyUzDPWtekrQ9MClrCfk8iKQBYMLNPAmLmIssbe2ptgTg2NsE oJi+ofUxu8IqyKmsQaR9qKA5E2+ZaS6FqyACxtR1nNOQ5f1c0FgULAjF4lxIznHBR5Is coCsszdVX5rvDxAS4VbSqXl0xtKqlItAjpUQ6h/0dISrcplI+eJH25YKNfTMK5pS1mGn 4HGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FgbJxF5/5LFEGqGpel9u7YKfMRyYN1cc0tKnfk8Be2E=; b=aaXqBU/ICjQqTTuqZgDTR9+v8NqMFLifFZ6NoB98GeiLLH4KrzSiCLJBBsNWaJbS44 DJMsglMl7Uh8jHjMoapOkMWmhk+V4Qq8hvIj5uc/4Kc8/pb6yad9bd2uPqcYjlCFHeYE fB0tBHdChgspuS2wBUbCeEkQ/orTfdTnGU8uI/spJY1Fhusq9On0XkIBXLDOwPV+LU6M r8+iK8rJMHJvh2mbylkWGLmYw82ZCH2QZ7gWBeti/MaX3BwVkqwd2v31TcYsf6qiIJUk FHALytdFBE2Zm+V6wOuWAy+AxrgH7c6X36ou6ogTudUkKIiobrm2OfpHrrBhzDsSzxnJ 1ITw== X-Gm-Message-State: ABuFfohbSn11Y90yjF+ytJnUpGWtctMuIFpQ8j+X/SzWJlimZHEx68Db 5TL/p84ZYFjuhSjYR7Lq2ATc/tbr X-Google-Smtp-Source: ACcGV60Y4i8II6ZfCkFDyK559VOmpVSKPvslCszqY4qaReaTkypRO0zuVEX043aSrxImGK9YfIzofQ== X-Received: by 2002:adf:e387:: with SMTP id e7-v6mr931357wrm.94.1539251915737; Thu, 11 Oct 2018 02:58:35 -0700 (PDT) Received: from arch.schneider-electric.com ([165.225.76.75]) by smtp.gmail.com with ESMTPSA id x185-v6sm15335261wmg.12.2018.10.11.02.58.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 02:58:34 -0700 (PDT) From: Lionel Orry To: buildroot@buildroot.org Date: Thu, 11 Oct 2018 11:57:55 +0200 Message-Id: <20181011095755.9188-4-lionel.orry@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181011095755.9188-1-lionel.orry@gmail.com> References: <20181011095755.9188-1-lionel.orry@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/4] pkg-cmake: _SUBDIR cleanup 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: , Cc: Lionel Orry Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" No functional change is brought by this modification. This patch removes redundant _SRCDIR declaration (already defined in pkg-generic.mk) Signed-off-by: Lionel Orry --- package/pkg-cmake.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index 51a1929ebb..b9ce8ff622 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -60,8 +60,6 @@ $(2)_INSTALL_OPTS ?= install $(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast $(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) - $(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES