diff options
| -rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs-128/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-oe/recipes-extended/mozjs/mozjs-128/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch deleted file mode 100644 index 38496ea56c..0000000000 --- a/meta-oe/recipes-extended/mozjs/mozjs-128/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | From c860dcbe63b0e393c95bfb0131238f91aaac11d3 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex@linutronix.de> | ||
| 3 | Date: Thu, 7 Oct 2021 12:44:18 +0200 | ||
| 4 | Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize' | ||
| 5 | names | ||
| 6 | |||
| 7 | The outcome is that processed names no longer match our custom rust | ||
| 8 | target definitions, and the build fails. | ||
| 9 | |||
| 10 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 12 | |||
| 13 | --- | ||
| 14 | build/moz.configure/init.configure | 2 +- | ||
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 16 | |||
| 17 | --- a/build/moz.configure/init.configure | ||
| 18 | +++ b/build/moz.configure/init.configure | ||
| 19 | @@ -647,24 +647,7 @@ def help_host_target(help, host, target) | ||
| 20 | |||
| 21 | def config_sub(shell, triplet): | ||
| 22 | config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub") | ||
| 23 | - # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so | ||
| 24 | - # munge those before and after calling config.sub. | ||
| 25 | - suffix = None | ||
| 26 | - munging = { | ||
| 27 | - "-windows-msvc": "-mingw32", | ||
| 28 | - "-windows-gnu": "-mingw32", | ||
| 29 | - } | ||
| 30 | - for check_suffix, replacement in munging.items(): | ||
| 31 | - if triplet.endswith(check_suffix): | ||
| 32 | - suffix = check_suffix | ||
| 33 | - triplet = triplet[: -len(suffix)] + replacement | ||
| 34 | - break | ||
| 35 | - result = check_cmd_output(shell, config_sub, triplet).strip() | ||
| 36 | - if suffix: | ||
| 37 | - assert result.endswith(replacement) | ||
| 38 | - result = result[: -len(replacement)] + suffix | ||
| 39 | - return result | ||
| 40 | - | ||
| 41 | + return triplet | ||
| 42 | |||
| 43 | @depends("--host", shell) | ||
| 44 | @checking("for host system type", lambda h: h.alias) | ||
