ninja fixes

Author: pmp-p

emsdk-cc

@@ -308,7 +308,7 @@ if SKIP:
     final.extend(sys.argv)
 else:
     if AOUT:
-        if CMAKE or CONFIGURE:
+        if CMAKE or NINJA or RUSTC or CONFIGURE:
             EXE = False
         # should not happen
         elif AOUT.endswith(".o") and "-c" not in out:

scripts/cpython-build-emsdk-prebuilt.sh

@@ -83,20 +83,105 @@ $HPIP install --force ninja
 # patch ninja for jobs limit and wrapper detection
 # https://github.com/ninja-build/ninja/issues/1482
 
-cat > ${HOST_PREFIX}/bin/ninja <<END
-#!${HOST_PREFIX}/bin/python${PYBUILD}
+cat > ${HOST_PREFIX}/lib/python${PYBUILD}/site-packages/ninja/__init__.py <<END
+from __future__ import annotations
+
+import os
+import subprocess
+import sys
+import sysconfig
+from collections.abc import Iterable
+from typing import NoReturn
+
+from ._version import version as __version__
+from .ninja_syntax import Writer, escape, expand
+
+__all__ = ["BIN_DIR", "DATA", "Writer", "__version__", "escape", "expand", "ninja"]
+
+
+def __dir__() -> list[str]:
+    return __all__
+
+
+def _get_ninja_dir() -> str:
+    ninja_exe = "ninja" + sysconfig.get_config_var("EXE")
+
+    # Default path
+    path = os.path.join(sysconfig.get_path("scripts"), ninja_exe)
+    if os.path.isfile(path):
+        return os.path.dirname(path)
+
+    # User path
+    if sys.version_info >= (3, 10):
+        user_scheme = sysconfig.get_preferred_scheme("user")
+    elif os.name == "nt":
+        user_scheme = "nt_user"
+    elif sys.platform.startswith("darwin") and getattr(sys, "_framework", None):
+        user_scheme = "osx_framework_user"
+    else:
+        user_scheme = "posix_user"
+
+    path = sysconfig.get_path("scripts", scheme=user_scheme)
+
+    if os.path.isfile(os.path.join(path, ninja_exe)):
+        return path
+
+    # Fallback to python location
+    path = os.path.dirname(sys.executable)
+    if os.path.isfile(os.path.join(path, ninja_exe)):
+        return path
+
+    return ""
+
+
+BIN_DIR = _get_ninja_dir()
+
+
+def _program(name: str, args: Iterable[str]) -> int:
+    cmd = os.path.join('${HOST_PREFIX}/bin', name)
+    return subprocess.call([cmd, *args], close_fds=False)
+
+def ninja() -> NoReturn:
+    import os
+    os.environ['NINJA'] = "1"
+    if not sys.argv[-1] != "--version":
+        sys.argv.insert(1,'1')
+        sys.argv.insert(1,'-j')
+#        import time
+#        while os.path.isfile('/tmp/ninja'):
+#            time.sleep(.5)
+#        open('/tmp/ninja','w').close()
+
+    ret = _program('ninja.real', sys.argv[1:])
+#    try:
+#        os.unlink('/tmp/ninja')
+#    except:
+#        pass
+    raise SystemExit(ret)
+
+END
+
+
+
+if [ -f $HOST_PREFIX/bin/ninja.real ]
+then
+    echo ninja already patched
+else
+    mv $HOST_PREFIX/bin/ninja $HOST_PREFIX/bin/ninja.real
+    cat > $HOST_PREFIX/bin/ninja <<END
+#!/opt/python-wasm-sdk/devices/x86_64/usr/bin/python3
 # -*- coding: utf-8 -*-
 import re
 import sys
-sys.argv.insert(1,'1')
-sys.argv.insert(1,'-j')
-import os
-os.environ['NINJA']="1"
 from ninja import ninja
 if __name__ == '__main__':
-    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?\$', '', sys.argv[0])
+    sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
     sys.exit(ninja())
 END
+    chmod +x $HOST_PREFIX/bin/ninja
+fi
+
+
 
 echo "
     *   cpython-build-emsdk-prebuilt pip==$PIP   *

scripts/cpython-build-emsdk.sh

@@ -15,9 +15,7 @@ export PYTHON_FOR_BUILD=${PYTHON_FOR_BUILD:-${HPY}}
 
 . ./scripts/emsdk-fetch.sh
 
-REBUILD_WASM=${REBUILD_WASMPY:-false}
-
-if $REBUILD || $REBUILD_WASMPY
+if ${REBUILD_WASMPY:-false}
 then
     rm -rf build/cpython-wasm/ build/pycache/config.cache
     rm build/cpython-wasm/libpython${PYBUILD}.a 2>/dev/null
@@ -130,7 +128,7 @@ echo "
 
 
 
-if [ -f build/cpython-wasm/libpython${PYBUILD}.a ]
+if [ -f ${SDKROOT}/build/cpython-wasm/libpython${PYBUILD}.a ]
 then
     echo "
         * not rebuilding cpython-wasm for [$PYDK_PYTHON_HOST_PLATFORM]

scripts/cpython-fetch.sh

@@ -79,8 +79,17 @@ fi
 
 if echo $PYBUILD |grep -q 13$
 then
-    wget -q -c https://www.python.org/ftp/python/3.13.1/Python-3.13.1.tar.xz
-    tar xf Python-3.13.1.tar.xz
+    if [ -d Python-3.13.1 ]
+    then
+        echo "  * Using local cpython sources"
+    else
+        pwd
+        ls
+        echo "  * fetching remote cpython sources"
+        wget -q -c https://www.python.org/ftp/python/3.13.1/Python-3.13.1.tar.xz
+        tar xf Python-3.13.1.tar.xz || exit 87
+    fi
+
     ln -s Python-3.13.1 cpython${PYBUILD}
 
     sed -i 's|ProcessPoolExecutor = None|return True|g' cpython3.13/Lib/compileall.py

scripts/emsdk-fetch.sh

@@ -6,35 +6,52 @@ then
 
     . ${CONFIG:-config}
 
+
+
+    # for full rebuild
+    # rm emsdk/.complete
+
     if [ -d emsdk ]
     then
         echo "
         * using emsdk from $(realpath emsdk)
             with sys python $SYS_PYTHON
 " 1>&2
     else
-        # emsdk could have been deleted for full rebuild
-        rm emsdk/.complete
+        git clone --no-tags --depth 1 --single-branch --branch main https://github.com/emscripten-core/emsdk.git
+        pushd emsdk
+            #git checkout 91f8563a9d1a4a0ec03bbb2be23485367d85a091
+            ./emsdk install ${EMFLAVOUR:-latest}
+            ./emsdk activate ${EMFLAVOUR:-latest}
+        popd
+    fi
 
-        if git clone --no-tags --depth 1 --single-branch --branch main https://github.com/emscripten-core/emsdk.git
-        then
-            pushd emsdk
-                #git checkout 91f8563a9d1a4a0ec03bbb2be23485367d85a091
-                ./emsdk install ${EMFLAVOUR:-latest}
-                ./emsdk activate ${EMFLAVOUR:-latest}
 
 
-                pushd upstream/emscripten
-                    echo "FIXME: applying stdio* are not const"
-                    sed -i 's|extern FILE \*const|extern FILE \*|g' cache/sysroot/include/stdio.h
 
-                    echo "FIXME: Applying https://github.com/emscripten-core/emscripten/pull/20281 dylink.js : handle ** argument case"
-if [ -f test/other/test_em_js_side.c b/test/other/test_em_js_side.c ]
-then
-                    wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/20281.diff
-                    patch -p1 < 20281.diff
-else
-                    patch -p1 <<END
+
+    if [ -f emsdk/.complete ]
+    then
+        echo " * found emsdk/.complete : not patching/building emsdk"
+    else
+        pushd emsdk/upstream/emscripten
+
+
+
+
+            echo "FIXME: applying stdio* are not const"
+            sed -i 's|extern FILE \*const|extern FILE \*|g' cache/sysroot/include/stdio.h
+
+
+
+
+            echo "FIXME: Applying https://github.com/emscripten-core/emscripten/pull/20281 dylink.js : handle ** argument case"
+            if [ -f test/other/test_em_js_side.c b/test/other/test_em_js_side.c ]
+            then
+                wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/20281.diff
+                patch -p1 < 20281.diff
+            else
+                patch -p1 <<END
 diff --git a/src/library_dylink.js b/src/library_dylink.js
 index 632e20aa61e3..ebb13995d6c3 100644
 --- a/src/library_dylink.js
@@ -50,28 +67,30 @@ index 632e20aa61e3..ebb13995d6c3 100644
            var func = `(${jsArgs}) => ${body};`;
 END
 
-fi
-                    echo "FIXME: Applying https://github.com/emscripten-core/emscripten/pull/17956 file corruption when using emscripten_run_preload_plugins with BrowserFS"
-                    wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/17956.diff
-
-                    if patch -p1 < 17956.diff
-                    then
-                        echo applied https://github.com/emscripten-core/emscripten/pull/17956
-                        # 18941 has been merged
-                    else
-                        # deal with old version of emsdk for the above 3.1.45 patch
-                        sed -i 's|new Uint8Array(data.object.contents), true, true|FS.readFile(_file), true, true|g' src/library_browser.js
-                        # merged since 3.1.34 which quite the more stable atm
-                        #echo "MAYBE FIXME: Applying https://github.com/emscripten-core/emscripten/pull/18941"
-                        #wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/18941.diff
-                        #patch -p1 < 18941.diff
-                    fi
-                popd
+            fi
+
+
+            echo "FIXME: Applying https://github.com/emscripten-core/emscripten/pull/17956 file corruption when using emscripten_run_preload_plugins with BrowserFS"
+            wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/17956.diff
+
+                if patch -p1 < 17956.diff
+                then
+                    echo applied https://github.com/emscripten-core/emscripten/pull/17956
+                    # 18941 has been merged
+                else
+                    # deal with old version of emsdk for the above 3.1.45 patch
+                    sed -i 's|new Uint8Array(data.object.contents), true, true|FS.readFile(_file), true, true|g' src/library_browser.js
+                    # merged since 3.1.34 which quite the more stable atm
+                    #echo "MAYBE FIXME: Applying https://github.com/emscripten-core/emscripten/pull/18941"
+                    #wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/18941.diff
+                    #patch -p1 < 18941.diff
+                fi
+        popd # emsdk/upstream/emscripten
 
 #                wget https://raw.githubusercontent.com/paradust7/minetest-wasm/main/emsdk_emcc.patch
 #                patch -p1 < emsdk_emcc.patch
 
-                pushd upstream/emscripten
+        pushd upstream/emscripten
                     echo "FIXME: Applying https://github.com/emscripten-core/emscripten/pull/21472 glfw3: gl level version major/minor hints"
                     wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/21472.diff
                     patch -p1 < 21472.diff
@@ -94,12 +113,12 @@ fi
                     #echo "FIXME: scriptDirectory workaround" MERGER
                     #wget https://patch-diff.githubusercontent.com/raw/emscripten-core/emscripten/pull/22605.diff
                     #patch -p1 < 22605.diff
-                popd
+        popd # upstream/emscripten
 
 
 
-                # https://github.com/paradust7/minetest-wasm/blob/main/emsdk_dirperms.patch
-                patch -p1 <<END
+        # https://github.com/paradust7/minetest-wasm/blob/main/emsdk_dirperms.patch
+        patch -p1 <<END
 --- emsdk-orig/upstream/emscripten/system/lib/wasmfs/wasmfs.cpp	2022-07-29 17:22:28.000000000 +0000
 +++ emsdk/upstream/emscripten/system/lib/wasmfs/wasmfs.cpp	2022-08-06 02:07:24.098196400 +0000
 @@ -141,7 +141,7 @@
@@ -133,8 +152,8 @@ END
 #END
 
 
-                # https://raw.githubusercontent.com/paradust7/minetest-wasm/main/emsdk_setlk.patch
-                patch -p1 << END
+            # https://raw.githubusercontent.com/paradust7/minetest-wasm/main/emsdk_setlk.patch
+            patch -p1 << END
 --- emsdk-orig/upstream/emscripten/system/lib/wasmfs/syscalls.cpp	2022-07-29 17:22:28.000000000 +0000
 +++ emsdk/upstream/emscripten/system/lib/wasmfs/syscalls.cpp	2022-08-06 05:05:17.014502697 +0000
 @@ -1419,7 +1419,7 @@
@@ -148,12 +167,7 @@ END
      case F_SETOWN:
 END
 
-
-
-
-            popd
-        fi
-    fi
+    fi # emsdk/.complete
 
     export EMSDK_PYTHON=$SYS_PYTHON
 

sources.extra/1000-glib.sh renamed to sources.extra/1900-glib.sh

@@ -5,13 +5,6 @@
 
 . ${CONFIG:-config}
 
-if which meson
-then
-    echo meson found $(which meson)
-else
-    $HPY -m pip install meson
-fi
-
 . scripts/emsdk-fetch.sh
 
 if pushd ${ROOT}/src
@@ -46,8 +39,7 @@ then
     done
 
     # Common compiler flags
-    export CFLAGS="-O3"
-    export CXXFLAGS="$CFLAGS"
+    export COPTS="-Os -g0"
     export LDFLAGS="-L$PREFIX/lib"
 
 
@@ -138,14 +130,37 @@ cpu_family = 'wasm32'
 cpu = 'wasm32'
 endian = 'little'
 
-[ninja]
+[backend]
 backend_max_links = 1
 
 END
 
-    meson setup _build --prefix=$PREFIX --cross-file=emscripten-crossfile.meson --default-library=static --buildtype=release \
+    echo "
+
+
+    ============ MESON SETUP $(which ninja) =========================
+
+
+"
+    meson setup _build --reconfigure --prefix=$PREFIX --cross-file=emscripten-crossfile.meson --default-library=static --buildtype=minsize \
       --force-fallback-for=pcre2,gvdb -Dselinux=disabled -Dxattr=false -Dlibmount=disabled -Dnls=disabled \
       -Dtests=false -Dglib_assert=false -Dglib_checks=false
+    echo "
+
+
+    ============ MESON COMPILE =========================
+
+
+"
+    # meson compile _build -j 1
+    echo "
+
+
+    ============ MESON INSTALL =========================
+
+
+"
+
     meson install -C _build --tag devel
     popd  # glib
     popd # src