package/lz4: simplify build/install logic
PATCH 1/1 package/lz4: simplify build/install logic
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.
--- package/lz4/lz4.mk | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
package/lz4/lz4.mk +13 -11
@@ -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))
Signature · 1 line
2.20.1
Yann E. MORIN
AppliedPATCH 1/1 package/lz4: simplify build/install logic
Peter, All,
On 2020-07-27 18:20 +0200, Peter Korsgaard spake thusly:
Quoted 9 lines
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
Makefilein the sub directory rather than the helper lib/lz4 targets in the top levelMakefile.Signed-off-by Peter Korsgaard <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 58 lines
--- package/lz4/lz4.mk | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)package/lz4/lz4.mk +13
-11@@ -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))Signature · 6 lines
2.20.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'