Brad Bishop | 79641f2 | 2019-09-10 07:20:22 -0400 | [diff] [blame] | 1 | From 43fbc3f53302a395463e8450ac81c53f623eec3f Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 27 Aug 2019 17:42:34 +0200 |
| 4 | Subject: [PATCH] mono-find-provides/requires: do not use monodis from the host |
| 5 | |
| 6 | There was a host contamination issue here: if monodis was installed |
| 7 | on the host, do_package would use that to resolve dependencies |
| 8 | of mono libraries (and often fail in that). Without monodis, |
| 9 | no dependencies are resolved, which is seemingly how things |
| 10 | are supposed to work. |
| 11 | |
| 12 | Upstream-Status: Inappropriate [oe-core specific] |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | --- |
| 15 | scripts/mono-find-provides | 8 ++++---- |
| 16 | scripts/mono-find-requires | 8 ++++---- |
| 17 | 2 files changed, 8 insertions(+), 8 deletions(-) |
| 18 | |
| 19 | diff --git a/scripts/mono-find-provides b/scripts/mono-find-provides |
| 20 | index 9348457d3..b28872ffb 100644 |
| 21 | --- a/scripts/mono-find-provides |
| 22 | +++ b/scripts/mono-find-provides |
| 23 | @@ -18,11 +18,11 @@ monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$")) |
| 24 | build_bindir="$2/usr/bin" |
| 25 | build_libdir="$2$3" |
| 26 | |
| 27 | -if [ -x $build_bindir/monodis ]; then |
| 28 | - monodis="$build_bindir/monodis" |
| 29 | +if [ -x $build_bindir/monodis.bogus ]; then |
| 30 | + monodis="$build_bindir/monodis.bogus" |
| 31 | export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} |
| 32 | -elif [ -x /usr/bin/monodis ]; then |
| 33 | - monodis="/usr/bin/monodis" |
| 34 | +elif [ -x /usr/bin/monodis.bogus ]; then |
| 35 | + monodis="/usr/bin/monodis.bogus" |
| 36 | else |
| 37 | exit 0; |
| 38 | fi |
| 39 | diff --git a/scripts/mono-find-requires b/scripts/mono-find-requires |
| 40 | index ea58cae48..d270169e1 100644 |
| 41 | --- a/scripts/mono-find-requires |
| 42 | +++ b/scripts/mono-find-requires |
| 43 | @@ -18,11 +18,11 @@ monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$")) |
| 44 | build_bindir="$2/usr/bin" |
| 45 | build_libdir="$2$3" |
| 46 | |
| 47 | -if [ -x $build_bindir/monodis ]; then |
| 48 | - monodis="$build_bindir/monodis" |
| 49 | +if [ -x $build_bindir/monodis.bogus ]; then |
| 50 | + monodis="$build_bindir/monodis.bogus" |
| 51 | export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} |
| 52 | -elif [ -x /usr/bin/monodis ]; then |
| 53 | - monodis="/usr/bin/monodis" |
| 54 | +elif [ -x /usr/bin/monodis.bogus ]; then |
| 55 | + monodis="/usr/bin/monodis.bogus" |
| 56 | else |
| 57 | exit 0; |
| 58 | fi |