* [Buildroot] [PATCH 1/1] package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR
@ 2020-12-18 5:58 Tian Yuanhao
2020-12-19 11:26 ` Yann E. MORIN
2020-12-22 10:49 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Tian Yuanhao @ 2020-12-18 5:58 UTC (permalink / raw)
To: buildroot
When BR2_PER_PACKAGE_DIRECTORIES=y, $(TARGET_DIR) is evaluated as
$(BASE_DIR)/target, but $$(TARGET_DIR) is evaluated as
$(BASE_DIR)/per-package/$(PKG)_NAME/target.
Signed-off-by: Tian Yuanhao <tianyuanhao@aliyun.com>
---
package/pkg-golang.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk
index 3813e1c406..d07242310d 100644
--- a/package/pkg-golang.mk
+++ b/package/pkg-golang.mk
@@ -121,7 +121,7 @@ endif
ifndef $(2)_INSTALL_TARGET_CMDS
define $(2)_INSTALL_TARGET_CMDS
$$(foreach d,$$($(2)_INSTALL_BINS),\
- $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(TARGET_DIR)/usr/bin/$$(d)
+ $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d)
)
endef
endif
@@ -130,7 +130,7 @@ endif
ifndef $(2)_INSTALL_CMDS
define $(2)_INSTALL_CMDS
$$(foreach d,$$($(2)_INSTALL_BINS),\
- $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(HOST_DIR)/bin/$$(d)
+ $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d)
)
endef
endif
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR
2020-12-18 5:58 [Buildroot] [PATCH 1/1] package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR Tian Yuanhao
@ 2020-12-19 11:26 ` Yann E. MORIN
2020-12-22 10:49 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2020-12-19 11:26 UTC (permalink / raw)
To: buildroot
Tian, All,
On 2020-12-18 13:58 +0800, Tian Yuanhao via buildroot spake thusly:
> When BR2_PER_PACKAGE_DIRECTORIES=y, $(TARGET_DIR) is evaluated as
> $(BASE_DIR)/target, but $$(TARGET_DIR) is evaluated as
> $(BASE_DIR)/per-package/$(PKG)_NAME/target.
>
> Signed-off-by: Tian Yuanhao <tianyuanhao@aliyun.com>
Good catch! Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/pkg-golang.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk
> index 3813e1c406..d07242310d 100644
> --- a/package/pkg-golang.mk
> +++ b/package/pkg-golang.mk
> @@ -121,7 +121,7 @@ endif
> ifndef $(2)_INSTALL_TARGET_CMDS
> define $(2)_INSTALL_TARGET_CMDS
> $$(foreach d,$$($(2)_INSTALL_BINS),\
> - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(TARGET_DIR)/usr/bin/$$(d)
> + $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(TARGET_DIR)/usr/bin/$$(d)
> )
> endef
> endif
> @@ -130,7 +130,7 @@ endif
> ifndef $(2)_INSTALL_CMDS
> define $(2)_INSTALL_CMDS
> $$(foreach d,$$($(2)_INSTALL_BINS),\
> - $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(HOST_DIR)/bin/$$(d)
> + $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $$(HOST_DIR)/bin/$$(d)
> )
> endef
> endif
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR
2020-12-18 5:58 [Buildroot] [PATCH 1/1] package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR Tian Yuanhao
2020-12-19 11:26 ` Yann E. MORIN
@ 2020-12-22 10:49 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2020-12-22 10:49 UTC (permalink / raw)
To: buildroot
>>>>> "Tian" == Tian Yuanhao via buildroot <buildroot@busybox.net> writes:
> When BR2_PER_PACKAGE_DIRECTORIES=y, $(TARGET_DIR) is evaluated as
> $(BASE_DIR)/target, but $$(TARGET_DIR) is evaluated as
> $(BASE_DIR)/per-package/$(PKG)_NAME/target.
> Signed-off-by: Tian Yuanhao <tianyuanhao@aliyun.com>
Committed to 2020.02.x, 2020.08.x and 2020.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-22 10:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-18 5:58 [Buildroot] [PATCH 1/1] package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR Tian Yuanhao
2020-12-19 11:26 ` Yann E. MORIN
2020-12-22 10:49 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.