gawk: replace AR patch with upstreamed patch

(From OE-Core rev: 18da900ec1b4a9bac2c205145ec2282c52543fd2)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2021-10-19 12:35:28 +01:00
committed by Richard Purdie
parent 1037d5b2b0
commit 52f2c3413c

View File

@@ -1,35 +1,30 @@
From 207b94e37c84007b294e57878c913271aad544ef Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 11 Nov 2020 23:13:23 -0800
Subject: [PATCH] Use cross AR during compile
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
If AR is specifcied then it should be used instead of defaulting to 'ar'
from host
From 47dce6a7002a8d7b818c19d574d81327b769871b Mon Sep 17 00:00:00 2001
From: "Arnold D. Robbins" <arnold@skeeve.com>
Date: Fri, 5 Jun 2020 13:14:54 +0300
Subject: Allow for cross-compile version of ar.
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
configure.ac | 7 +++++++
1 file changed, 7 insertions(+)
configure.ac | 3 +++
1 file changed, 3 insertions(+)
(limited to 'configure.ac')
diff --git a/configure.ac b/configure.ac
index 31364ab..4804f7b 100644
index 31364ab8..8c256f21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,6 +92,13 @@ GAWK_CANONICAL_HOST
AC_USE_SYSTEM_EXTENSIONS
@@ -105,6 +105,9 @@ AC_EXEEXT
AC_PROG_INSTALL
AC_PROG_MAKE_SET
dnl checks for programs
+m4_ifndef([AC_PROG_AR],[dnl
+ AN_MAKEVAR([AR], [AC_PROG_AR])
+ AN_PROGRAM([ar], [AC_PROG_AR])
+ AC_DEFUN([AC_PROG_AR],
+ [AC_CHECK_TOOL(AR, ar, :)])
+])
+AC_PROG_AR
AC_PROG_EGREP
AC_PROG_YACC
AC_PROG_LN_S
+# support/ builds libsupport.a, allow for cross version of ar
+AM_PROG_AR
+
# This is mainly for my use during testing and development.
# Yes, it's a bit of a hack.
AC_MSG_CHECKING([for special development options])
--
2.29.2
cgit v1.2.1