[gtk-osx: 1/2] Update ninja to 1.10.2




commit 546af98e8b2e8136384f28250626045ed1c5cc42
Author: Jiří Techet <techet gmail com>
Date:   Sun Nov 7 18:25:14 2021 +0100

    Update ninja to 1.10.2
    
    The 1.10.2 release is the first one which contains a universal binary (x86_64 and arm64)
    and is executed as an arm64 process on ARM macs. With the previous binary, ninja did
    run as a x86_64 process on ARM macs and as a result all tasks executed by ninja did run
    as x86_64 processes too. This lead to the following error when compiling the
    shared-mime-info package in an arm64 build (which is fixed after applying this patch):
    
    [8/8] Generating freedesktop.org.xml with a custom command
    FAILED: data/freedesktop.org.xml
    /Users/jhbuild/gtk/source/shared-mime-info-2.1/data/freedesktop_generate.sh 
/Users/jhbuild/gtk/source/shared-mime-info-2.1 /Users/jhbuild/.cache/jhbuild/build/shared-mime-info-2.1
    ninja: Entering directory `/Users/jhbuild/.cache/jhbuild/build/shared-mime-info-2.1'
    [0/1] Running external command shared-mime-info-gmo (wrapped by meson to set env)
    Traceback (most recent call last):
      File "/Users/jhbuild/gtk/inst/bin/itstool", line 27, in <module>
        import libxml2
      File "/Users/jhbuild/gtk/inst/lib/python3.8/site-packages/libxml2.py", line 1, in <module>
        import libxml2mod
    ImportError: dlopen(/Users/jhbuild/gtk/inst/lib/python3.8/site-packages/libxml2mod.so, 0x0002): tried: 
'/Users/jhbuild/gtk/inst/lib/python3.8/site-packages/libxml2mod.so' (mach-o file, but is an incompatible 
architecture (have 'arm64', need 'x86_64')), '/usr/local/lib/libxml2mod.so' (no such file), 
'/usr/lib/libxml2mod.so' (no such file)

 gtk-osx-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gtk-osx-setup.sh b/gtk-osx-setup.sh
index 7cbbc719..1618972f 100755
--- a/gtk-osx-setup.sh
+++ b/gtk-osx-setup.sh
@@ -154,7 +154,7 @@ fi
 # Install Ninja
 NINJA=`which ninja`
 if test ! -x "$NINJA" -a ! -x "$DEVPREFIX/bin/ninja"; then
-    curl -kLs https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip -o 
"$DEVPREFIX/ninja-mac.zip"
+    curl -kLs https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-mac.zip -o 
"$DEVPREFIX/ninja-mac.zip"
     unzip -d "$DEVPREFIX/bin" "$DEVPREFIX/ninja-mac.zip"
     rm "$DEVPREFIX/ninja-mac.zip"
 fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]