Skip to contentSkip to conversation

package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR

PATCH New Tian Yuanhao 3 participants 3 messages Dec 18, 2020 – Dec 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR

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.

---
 package/pkg-golang.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/pkg-golang.mk +2 -2
index 3813e1c406..d07242310d 100644
@@ -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
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR

Tian, All,

On 2020-12-18 13:58 +0800, Tian Yuanhao via buildroot spake thusly:

Quoted 5 lines

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.

Good catch! Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 33 lines
---
 package/pkg-golang.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/pkg-golang.mk +2 -2
index 3813e1c406..d07242310d 100644
@@ -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
Signature · 6 lines
2.25.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.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/pkg-golang.mk: postpone evaluation of TARGET_DIR and HOST_DIR

In reply to Tian Yuanhao
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Tian" == Tian Yuanhao via buildroot <[email protected]> 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.

Committed to 2020.02.x, 2020.08.x and 2020.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard