summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-11-11 23:02:25 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-20 10:53:21 +0000
commit23a0428069c61331766d749998902c137db9278b (patch)
tree9f64db4db1408ef803eaf5ab7d65f4337a78436e
parentb74901b816114143df1c7a87ece82fdf1368f90c (diff)
downloadpoky-23a0428069c61331766d749998902c137db9278b.tar.gz
lrzsz: Use Cross AR during compile
Current code hardcodes archiver to be 'ar' from build host (From OE-Core rev: 694202b05134bdef603b69667cd70a28bb311ccf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 74ed1d10434213ad3fcf54ded49879090f979e1e) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0001-Fix-cross-compilation-using-autoconf-detected-AR.patch36
-rw-r--r--meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0001-Fix-cross-compilation-using-autoconf-detected-AR.patch b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0001-Fix-cross-compilation-using-autoconf-detected-AR.patch
new file mode 100644
index 0000000000..47c7ec4170
--- /dev/null
+++ b/meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0001-Fix-cross-compilation-using-autoconf-detected-AR.patch
@@ -0,0 +1,36 @@
1From ecdcf0df6c28c65ca6d1e5638726e13e373c76c5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 11 Nov 2020 22:58:55 -0800
4Subject: [PATCH] Fix cross compilation using autoconf detected AR
5
6currently its using 'ar' program from build host, which is not expected,
7we need to respect AR passed in environment
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 configure.in | 7 +++++++
14 1 file changed, 7 insertions(+)
15
16diff --git a/configure.in b/configure.in
17index 4ddbe8b..b7c3c31 100644
18--- a/configure.in
19+++ b/configure.in
20@@ -84,6 +84,13 @@ AC_ARG_ENABLE(syslog,
21 ])
22
23 dnl Checks for programs.
24+m4_ifndef([AC_PROG_AR],[dnl
25+ AN_MAKEVAR([AR], [AC_PROG_AR])
26+ AN_PROGRAM([ar], [AC_PROG_AR])
27+ AC_DEFUN([AC_PROG_AR],
28+ [AC_CHECK_TOOL(AR, ar, :)])
29+])
30+AC_PROG_AR
31 AC_PROG_CC
32 AC_PROG_GCC_TRADITIONAL
33 dnl AC_PROG_INSTALL included in AM_INIT_AUTOMAKE
34--
352.29.2
36
diff --git a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
index 4129237c59..54c431eeb3 100644
--- a/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
+++ b/meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb
@@ -19,6 +19,7 @@ SRC_URI = "http://www.ohse.de/uwe/releases/lrzsz-${PV}.tar.gz \
19 file://lrzsz-check-locale.h.patch \ 19 file://lrzsz-check-locale.h.patch \
20 file://cve-2018-10195.patch \ 20 file://cve-2018-10195.patch \
21 file://include.patch \ 21 file://include.patch \
22 file://0001-Fix-cross-compilation-using-autoconf-detected-AR.patch \
22 " 23 "
23 24
24SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4" 25SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4"