diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-11-11 23:02:25 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-02 16:53:08 +0000 |
| commit | 6e1c3966d11961ccdb2e5917188a4a7648bf72da (patch) | |
| tree | 20b28a2e100e5f72d235690ef8451eea60533eba /meta | |
| parent | 44ce6c4a5d6cba6698368f4a3218b7eb9aa6bfb0 (diff) | |
| download | poky-6e1c3966d11961ccdb2e5917188a4a7648bf72da.tar.gz | |
lrzsz: Use Cross AR during compile
Current code hardcodes archiver to be 'ar' from build host
(From OE-Core rev: 99435486248731700d11144c909a9d688e35dd1d)
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: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-bsp/lrzsz/lrzsz-0.12.20/0001-Fix-cross-compilation-using-autoconf-detected-AR.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-bsp/lrzsz/lrzsz_0.12.20.bb | 1 |
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 @@ | |||
| 1 | From ecdcf0df6c28c65ca6d1e5638726e13e373c76c5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 11 Nov 2020 22:58:55 -0800 | ||
| 4 | Subject: [PATCH] Fix cross compilation using autoconf detected AR | ||
| 5 | |||
| 6 | currently its using 'ar' program from build host, which is not expected, | ||
| 7 | we need to respect AR passed in environment | ||
| 8 | |||
| 9 | Upstream-Status: Pending | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | --- | ||
| 13 | configure.in | 7 +++++++ | ||
| 14 | 1 file changed, 7 insertions(+) | ||
| 15 | |||
| 16 | diff --git a/configure.in b/configure.in | ||
| 17 | index 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 | -- | ||
| 35 | 2.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 | ||
| 24 | SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4" | 25 | SRC_URI[md5sum] = "b5ce6a74abc9b9eb2af94dffdfd372a4" |
