* [PATCH] make.sh: Update check for static linked qemu files
@ 2022-11-28 13:24 Adolf Belka
2022-11-28 13:29 ` Michael Tremer
0 siblings, 1 reply; 2+ messages in thread
From: Adolf Belka @ 2022-11-28 13:24 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 698 bytes --]
- In Arch Linux the file -L command comes up with "static-pie linked" instead of
"statically linked"
- This patch makes the grep look for either one of those strings.
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.sh b/make.sh
index c0d1f1d2c..e214fdf3e 100755
--- a/make.sh
+++ b/make.sh
@@ -910,7 +910,7 @@ qemu_find_build_helper_name() {
file_is_static() {
local file="${1}"
- file -L "${file}" 2>/dev/null | grep -q "statically linked"
+ file -L "${file}" 2>/dev/null | grep -q -e "statically linked" -e "static-pie linked"
}
update_language_list() {
--
2.38.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] make.sh: Update check for static linked qemu files
2022-11-28 13:24 [PATCH] make.sh: Update check for static linked qemu files Adolf Belka
@ 2022-11-28 13:29 ` Michael Tremer
0 siblings, 0 replies; 2+ messages in thread
From: Michael Tremer @ 2022-11-28 13:29 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 880 bytes --]
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
> On 28 Nov 2022, at 13:24, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>
> - In Arch Linux the file -L command comes up with "static-pie linked" instead of
> "statically linked"
> - This patch makes the grep look for either one of those strings.
>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> make.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/make.sh b/make.sh
> index c0d1f1d2c..e214fdf3e 100755
> --- a/make.sh
> +++ b/make.sh
> @@ -910,7 +910,7 @@ qemu_find_build_helper_name() {
> file_is_static() {
> local file="${1}"
>
> - file -L "${file}" 2>/dev/null | grep -q "statically linked"
> + file -L "${file}" 2>/dev/null | grep -q -e "statically linked" -e "static-pie linked"
> }
>
> update_language_list() {
> --
> 2.38.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-11-28 13:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-28 13:24 [PATCH] make.sh: Update check for static linked qemu files Adolf Belka
2022-11-28 13:29 ` Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox