From patchwork Wed Jan 10 22:40:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 858601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@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=) 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 3zH3rZ5Qw6z9s7g for ; Thu, 11 Jan 2018 09:41:02 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 22A233059A; Wed, 10 Jan 2018 22:40:59 +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 bTj55we4MsWV; Wed, 10 Jan 2018 22:40:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 170D430305; Wed, 10 Jan 2018 22:40:57 +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 827C21C3F96 for ; Wed, 10 Jan 2018 22:40:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7E1568931B for ; Wed, 10 Jan 2018 22:40:56 +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 g3Dd8kaSfopZ for ; Wed, 10 Jan 2018 22:40:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by hemlock.osuosl.org (Postfix) with ESMTP id 100C7892A1 for ; Wed, 10 Jan 2018 22:40:54 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id A5B892084B; Wed, 10 Jan 2018 23:40:53 +0100 (CET) Received: from localhost (LFbn-1-17296-229.w86-250.abo.wanadoo.fr [86.250.111.229]) by mail.free-electrons.com (Postfix) with ESMTPSA id 4CFA72072D; Wed, 10 Jan 2018 23:40:53 +0100 (CET) From: Thomas Petazzoni To: Buildroot List , Jamin Collins , "Arnout Vandecappelle (Essensium/Mind)" Date: Wed, 10 Jan 2018 23:40:52 +0100 Message-Id: <20180110224052.6830-1-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.14.3 Subject: [Buildroot] [PATCH] lz4: install programs as well as libraries X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Prior to commit 8ad38a4fc2007df4bee9a941aed46c8771b6a84c ("package/lz4: bump version to r131"), the lz4 package was installing both libraries and programs, but this commit changed the behavior to only install libraries. The contributor might have been confused by the fact that the build command was "$(MAKE) ... -C $(@D) liblz4", suggesting that only the library was built. But since the install command was "$(MAKE) ... -C $(@D) install", the programs were effectively built as part of the install step, and installed as well. Since it makes sense for lz4 to also installs its programs, this commit adjusts the package accordingly. It is worth mentioning that using the "all" target during the build step is important. Indeed, otherwise the programs/Makefile has a "default" target that doesn't build everything (especially the lz4c program) and it end up being built as part of the install step, due to how the makefile dependencies are handled in the lz4 project. To make sure that everything gets built during the build step, we explicitly use the "all" target. Fixes bug #9996 Reported-by: Jamin Collins Initial-analysis-by: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/lz4/lz4.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk index 91ff43b052..de8c311a31 100644 --- a/package/lz4/lz4.mk +++ b/package/lz4/lz4.mk @@ -18,7 +18,7 @@ LZ4_POST_PATCH_HOOKS += LZ4_DISABLE_SHARED endif define HOST_LZ4_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) all endef define HOST_LZ4_INSTALL_CMDS @@ -27,7 +27,7 @@ define HOST_LZ4_INSTALL_CMDS endef define LZ4_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/lib + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) all endef define LZ4_INSTALL_STAGING_CMDS @@ -37,7 +37,7 @@ endef define LZ4_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \ - PREFIX=/usr install -C $(@D)/lib + PREFIX=/usr install -C $(@D) endef $(eval $(generic-package))