From patchwork Mon Jul 27 16:20:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 1337067 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=korsgaard.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=vQJ78bWn; 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 4BFlQb118Yz9sPB for ; Tue, 28 Jul 2020 02:20:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A9E4C854D0; Mon, 27 Jul 2020 16:20:21 +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 DntnXuvJfIo1; Mon, 27 Jul 2020 16:20:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 26BBF85579; Mon, 27 Jul 2020 16:20:21 +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 0288B1BF387 for ; Mon, 27 Jul 2020 16:20:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EE5A5204AB for ; Mon, 27 Jul 2020 16:20:18 +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 nQKl5umhgWvq for ; Mon, 27 Jul 2020 16:20:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f67.google.com (mail-ej1-f67.google.com [209.85.218.67]) by silver.osuosl.org (Postfix) with ESMTPS id 5B62E20481 for ; Mon, 27 Jul 2020 16:20:17 +0000 (UTC) Received: by mail-ej1-f67.google.com with SMTP id f14so1816688ejb.2 for ; Mon, 27 Jul 2020 09:20:17 -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:mime-version :content-transfer-encoding; bh=AqEhKRZLHAe7cW+Yc6vb+fBZJT/WM7rLHL4coI+n1Co=; b=vQJ78bWnvB/wqftcYIdKilYi3KON9cxvIKF1B/XYPxQf9CR34KHagIuKUj1BivapvW T/3QgoPm96R5htfsv0yW0cT0hzVEQdroIPL2OfMNkTGrEKkBQlpzcevD2D5Mzl83UkNt AWShtE4atVR+FHxl+2TYy0EteZRSvvxk6tr8Gk6NydXEKhCOZgh84rz8IWcAMeujgDdW PqnaE8Gz3V1QUf1Et1m3O5I64YPrzBoOup7GbtDyhvc2LCYVksS49e+OZxr6qazs2bah XYIlt6D/OR/6HA5IAx+hiBH7+jHiP/E89K9XR8IWpHxlc8dMufbycWrfqdLrHBxRFv+K eK/A== 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 :mime-version:content-transfer-encoding; bh=AqEhKRZLHAe7cW+Yc6vb+fBZJT/WM7rLHL4coI+n1Co=; b=BIv4SZ1En89pnu8183bGECvJlqDxnvYzdR3/XzpE6jE6ILqtZf+8OUsrcXu+/YBmO7 a1VmsOV6JMdu8skPApv61ZpasrC/ctk+1QIj2grUn5Epnnx6yab/rBMNIyUoaSIacY+H +U2mGp1HQaoViFmY3oJ/OW9LNWQNssvQTG/2QIjoSC9aky4O0BScaBCbhFWwXtdaLmow wmk/5e1JK81HFMwiJ/6TMqRWk9Y16ap74giPTGZwG3LZjHz8cEFYRY9uW+EZWQQsqfE6 LBm0tSprHAO0XtBB1NjT1z9Z5N0F2vYu2At/l99oSZKUNyyprM5113rfLcZcsQpASjzc aniQ== X-Gm-Message-State: AOAM532ifm9PBCOgz3JKzFmqC0GAZLvU1YT9ecDFGl/nJjPfkgYAOg4V CDoe+Sk3aF/lofSyo5s/XEQK/r1m X-Google-Smtp-Source: ABdhPJxTrGry2YnsaQDyGYJB2sPRshn9QgEt5LRtSqyw2ouamt4yVGv7dQZdjXe+xfY0be1ZaiPWkg== X-Received: by 2002:a17:906:4c93:: with SMTP id q19mr22704085eju.253.1595866815337; Mon, 27 Jul 2020 09:20:15 -0700 (PDT) Received: from dell.be.48ers.dk (d51A5BC31.access.telenet.be. [81.165.188.49]) by smtp.gmail.com with ESMTPSA id h10sm7705172eds.0.2020.07.27.09.20.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 09:20:14 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.92) (envelope-from ) id 1k05rJ-0003gG-V4; Mon, 27 Jul 2020 18:20:13 +0200 From: Peter Korsgaard To: buildroot@buildroot.org Date: Mon, 27 Jul 2020 18:20:07 +0200 Message-Id: <20200727162008.14086-1-peter@korsgaard.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/lz4: simplify build/install logic 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: Peter Korsgaard Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" No functional change. Rather than tracking both build targets and sub directory to run 'make install' from, use a make loop for the staging/target install logic, similar to how we are doing it to for the build step and directly use the Makefile in the sub directory rather than the helper lib/lz4 targets in the top level Makefile. Signed-off-by: Peter Korsgaard --- package/lz4/lz4.mk | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index 1cdd39106c..fa309e8dbb 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -32,29 +32,31 @@ define HOST_LZ4_INSTALL_CMDS install -C $(@D) endef +LZ4_DIRS = lib + ifeq ($(BR2_PACKAGE_LZ4_PROGS),y) -LZ4_BUILD_TARGETS = lib lz4 -LZ4_INSTALL_OPTS = install -C $(@D) -else -LZ4_BUILD_TARGETS = lib -LZ4_INSTALL_OPTS = install -C $(@D)/lib +LZ4_DIRS += programs endif define LZ4_BUILD_CMDS - $(foreach target,$(LZ4_BUILD_TARGETS),\ + $(foreach dir,$(LZ4_DIRS),\ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(LZ4_MAKE_OPTS) \ - -C $(@D) $(target) + -C $(@D)/$(dir) ) endef define LZ4_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(STAGING_DIR) \ - PREFIX=/usr $(LZ4_MAKE_OPTS) $(LZ4_INSTALL_OPTS) + $(foreach dir,$(LZ4_DIRS),\ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(STAGING_DIR) \ + PREFIX=/usr $(LZ4_MAKE_OPTS) -C $(@D)/$(dir) install + ) endef define LZ4_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \ - PREFIX=/usr $(LZ4_MAKE_OPTS) $(LZ4_INSTALL_OPTS) + $(foreach dir,$(LZ4_DIRS),\ + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \ + PREFIX=/usr $(LZ4_MAKE_OPTS) -C $(@D)/$(dir) install + ) endef $(eval $(generic-package))