summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-05-08 21:23:50 -0700
committerArmin Kuster <akuster808@gmail.com>2023-05-28 15:58:45 -0400
commit49b02a060d29f044276cd95c896377d676f2fc1c (patch)
treea3f763b6d404de8f6c49e2a0ce9cd1d7792e613b
parent6208630ac5f3372ee852724705ee49f072fcbcee (diff)
downloadmeta-openembedded-49b02a060d29f044276cd95c896377d676f2fc1c.tar.gz
enca: Remove buildpaths from target scripts
Using configure checks to detect mktemp can result in problems in cross-builds where buildtime mktemp ( native ) maybe detected in a path that does not exist on target, therefore rely upon PATH variable to find this binary when executing this script. Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 3042c14399e0fdde7823b01af2e9a76027b37539) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch30
-rw-r--r--meta-oe/recipes-support/enca/enca_1.19.bb4
2 files changed, 32 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch b/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch
new file mode 100644
index 0000000000..32fa239084
--- /dev/null
+++ b/meta-oe/recipes-support/enca/enca/0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch
@@ -0,0 +1,30 @@
1From c6a59d512706978e8c67f9a2d84ec650f8763368 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 8 May 2023 18:02:52 -0700
4Subject: [PATCH] Do not use $MKTEMP_PROG in cross-build
5
6$MKTEMP_PROG points to native location which could be absolute path that
7wont exist on target rootfs. Therefore use it from PATH
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure.ac | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/configure.ac b/configure.ac
16index 4852a2f..d23b384 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -186,7 +186,7 @@ ye_PATH_LOCALE_ALIAS
20
21 dnl Random filename generation in scripts
22 if test -n "$MKTEMP_PROG"; then
23- SHELL_RANDOM_FILENAME='`'$MKTEMP_PROG' /tmp/enca-$$-XXXXXXXX`'
24+ SHELL_RANDOM_FILENAME='`mktemp /tmp/enca-$$-XXXXXXXX`'
25 else
26 SHELL_RANDOM_FILENAME='/tmp/enca-$$-$RANDOM'
27 fi
28--
292.40.1
30
diff --git a/meta-oe/recipes-support/enca/enca_1.19.bb b/meta-oe/recipes-support/enca/enca_1.19.bb
index eed0ad1b93..774f05f7c4 100644
--- a/meta-oe/recipes-support/enca/enca_1.19.bb
+++ b/meta-oe/recipes-support/enca/enca_1.19.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4"
10SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \ 10SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \
11 file://dont-run-tests.patch \ 11 file://dont-run-tests.patch \
12 file://makefile-remove-tools.patch \ 12 file://makefile-remove-tools.patch \
13 file://libenca-003-iconv.patch " 13 file://libenca-003-iconv.patch \
14 14 file://0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch"
15SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a" 15SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a"
16 16
17inherit autotools 17inherit autotools