forked from brl/citadel
Bruce Leidl
e20e601129
Updated Recipes: gcr4 3.92 -> 4.0.0 geoclue 2.5.7 -> 2.7.0 gjs 1.73.2 -> 1.77.90 gnome-backgrounds 42.0 -> 45.0 gnome-control-center 43.0 -> 45.0 gnome-desktop 43.rc -> 44.0 gsettings-desktop-schema 43.0 -> 45.0 libblockdev 2.26 -> 2.28 libgweather4 4.0.0 -> 4.2.0 libnma 1.8.38 -> 1.10.6 mozjs 102 -> 115 nss 3.64 -> 3.74 ovmf 202205 -> 202211 New recipes: appstream 0.16.3 libei 1.1.0 libxmlb 0.3.14 tecla 45.0 webm/libvpx 1.13 Recipes updated to replace poky recipes with insufficient version: glib-2.0 2.78.0 gtk+/gtk+3 3.24.38 gtk+/gtk4 4.12.1 icu 73_2 wayland/wayland 1.22.0 wayland/wayland-protocols 1.32 wayland/libinput 1.24.0 libadwaita 1.4.0
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
From 7a9f989f9ac74b6414982af8ef27848394a8edf8 Mon Sep 17 00:00:00 2001
|
|
From: Bruce Leidl <bruce@subgraph.com>
|
|
Date: Mon, 18 Sep 2023 15:28:14 -0400
|
|
Subject: [PATCH] fix init configure
|
|
|
|
---
|
|
build/moz.configure/init.configure | 31 +++++++++++++++---------------
|
|
1 file changed, 16 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
|
|
index 2ac40d3d39..dc8a605d06 100644
|
|
--- a/build/moz.configure/init.configure
|
|
+++ b/build/moz.configure/init.configure
|
|
@@ -650,23 +650,24 @@ def help_host_target(help, host, target):
|
|
|
|
def config_sub(shell, triplet):
|
|
config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub")
|
|
+ return triplet
|
|
# Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so
|
|
# munge those before and after calling config.sub.
|
|
- suffix = None
|
|
- munging = {
|
|
- "-windows-msvc": "-mingw32",
|
|
- "-windows-gnu": "-mingw32",
|
|
- }
|
|
- for check_suffix, replacement in munging.items():
|
|
- if triplet.endswith(check_suffix):
|
|
- suffix = check_suffix
|
|
- triplet = triplet[: -len(suffix)] + replacement
|
|
- break
|
|
- result = check_cmd_output(shell, config_sub, triplet).strip()
|
|
- if suffix:
|
|
- assert result.endswith(replacement)
|
|
- result = result[: -len(replacement)] + suffix
|
|
- return result
|
|
+ #suffix = None
|
|
+ #munging = {
|
|
+ # "-windows-msvc": "-mingw32",
|
|
+ # "-windows-gnu": "-mingw32",
|
|
+ #}
|
|
+ #for check_suffix, replacement in munging.items():
|
|
+ # if triplet.endswith(check_suffix):
|
|
+ # suffix = check_suffix
|
|
+ # triplet = triplet[: -len(suffix)] + replacement
|
|
+ # break
|
|
+ #result = check_cmd_output(shell, config_sub, triplet).strip()
|
|
+ #if suffix:
|
|
+ # assert result.endswith(replacement)
|
|
+ # result = result[: -len(replacement)] + suffix
|
|
+ #return result
|
|
|
|
|
|
@depends("--host", shell)
|