aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2018-01-10 23:40:52 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2018-01-16 19:44:55 +0100
commit2e18e017c53441c634e539463de9e11266913185 (patch)
tree00b06994a6d134394ab32c9e42da580e4f6bf833
parent6c97236d04e7ec493dedf91030afa649f8303572 (diff)
downloadbuildroot-2e18e017c53441c634e539463de9e11266913185.tar.gz
buildroot-2e18e017c53441c634e539463de9e11266913185.tar.bz2
lz4: install programs as well as libraries
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 <jamin.collins@gmail.com> Initial-analysis-by: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 6f1c11f79a64387c1f1749550804f8aae0cfa7a7) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/lz4/lz4.mk6
1 files 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))