Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/gawk: create awk symlink for host-gawk
@ 2021-06-15 14:03 Hubert Lacote
  2021-06-24 21:38 ` Yann E. MORIN
  2021-07-10 17:22 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Hubert Lacote @ 2021-06-15 14:03 UTC (permalink / raw)
  To: buildroot

From: Hubert Lacote <hubert.lacote@youview.com>

This is to make sure that host packages that depend on `host-gawk` and that use
`awk` end up using `gawk`, instead of the `awk` symlink installed on the host
system.

On recent Debian-based distributions, `awk` is still symlinked to `mawk` [1].

[1] https://bugs.launchpad.net/ubuntu/+source/mawk/+bug/1841654

Signed-off-by: Hubert Lacote <hubert.lacote@youview.com>
Co-authored-by: Hubert Lacote <hubert.lacote@youview.com>
Co-authored-by: Vicente Olivert Riera <vincent.olivert.riera@youview.com>
---
 package/gawk/gawk.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 16906f6f93..ab7088e90e 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -33,6 +33,12 @@ endif
 
 HOST_GAWK_CONF_OPTS = --without-readline --without-mpfr
 
+define HOST_GAWK_CREATE_SYMLINK
+	ln -sf gawk $(HOST_DIR)/usr/bin/awk
+endef
+
+HOST_GAWK_POST_INSTALL_HOOKS += HOST_GAWK_CREATE_SYMLINK
+
 define GAWK_CREATE_SYMLINK
 	ln -sf gawk $(TARGET_DIR)/usr/bin/awk
 endef
-- 
2.25.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] package/gawk: create awk symlink for host-gawk
  2021-06-15 14:03 [Buildroot] [PATCH] package/gawk: create awk symlink for host-gawk Hubert Lacote
@ 2021-06-24 21:38 ` Yann E. MORIN
  2021-07-10 17:22 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2021-06-24 21:38 UTC (permalink / raw)
  To: buildroot

Hubert, All,

On 2021-06-15 16:03 +0200, Hubert Lacote spake thusly:
> From: Hubert Lacote <hubert.lacote@youview.com>
> 
> This is to make sure that host packages that depend on `host-gawk` and that use
> `awk` end up using `gawk`, instead of the `awk` symlink installed on the host
> system.
> 
> On recent Debian-based distributions, `awk` is still symlinked to `mawk` [1].
> 
> [1] https://bugs.launchpad.net/ubuntu/+source/mawk/+bug/1841654
> 
> Signed-off-by: Hubert Lacote <hubert.lacote@youview.com>
> Co-authored-by: Hubert Lacote <hubert.lacote@youview.com>
> Co-authored-by: Vicente Olivert Riera <vincent.olivert.riera@youview.com>
> ---
>  package/gawk/gawk.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
> index 16906f6f93..ab7088e90e 100644
> --- a/package/gawk/gawk.mk
> +++ b/package/gawk/gawk.mk
> @@ -33,6 +33,12 @@ endif
>  
>  HOST_GAWK_CONF_OPTS = --without-readline --without-mpfr
>  
> +define HOST_GAWK_CREATE_SYMLINK
> +	ln -sf gawk $(HOST_DIR)/usr/bin/awk
> +endef
> +
> +HOST_GAWK_POST_INSTALL_HOOKS += HOST_GAWK_CREATE_SYMLINK

Usually, we add the host-variant stuff after the target-variant stuff,
so I moved that after the corresponding hook, below:

>  define GAWK_CREATE_SYMLINK
>  	ln -sf gawk $(TARGET_DIR)/usr/bin/awk
>  endef

Of course, I see that you inserted that next to the existing
host-variant CONF_OPTS, and I can see the reasoning. Still, I found it
odd for the host suff to be stuffed in the middle of the tarrget
stuff...

Applied to master, thanks.

Regards,
Yann E. MORIN.

> -- 
> 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] package/gawk: create awk symlink for host-gawk
  2021-06-15 14:03 [Buildroot] [PATCH] package/gawk: create awk symlink for host-gawk Hubert Lacote
  2021-06-24 21:38 ` Yann E. MORIN
@ 2021-07-10 17:22 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2021-07-10 17:22 UTC (permalink / raw)
  To: buildroot

>>>>> "Hubert" == Hubert Lacote <hubert.lacote@gmail.com> writes:

 > From: Hubert Lacote <hubert.lacote@youview.com>
 > This is to make sure that host packages that depend on `host-gawk` and that use
 > `awk` end up using `gawk`, instead of the `awk` symlink installed on the host
 > system.

 > On recent Debian-based distributions, `awk` is still symlinked to `mawk` [1].

 > [1] https://bugs.launchpad.net/ubuntu/+source/mawk/+bug/1841654

 > Signed-off-by: Hubert Lacote <hubert.lacote@youview.com>
 > Co-authored-by: Hubert Lacote <hubert.lacote@youview.com>
 > Co-authored-by: Vicente Olivert Riera <vincent.olivert.riera@youview.com>

Committed to 2021.02.x and 2021.05.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-07-10 17:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-15 14:03 [Buildroot] [PATCH] package/gawk: create awk symlink for host-gawk Hubert Lacote
2021-06-24 21:38 ` Yann E. MORIN
2021-07-10 17:22 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox