0.0.9

Author: pmp-p

scripts/cpython-build-emsdk.sh

@@ -147,17 +147,19 @@ else
 
     popd
 
+    mkdir -p ${ROOT}/prebuilt/emsdk
+
     # move them to MEMFS
-    mv $PREFIX/lib/python3.??/lib-dynload/* $ROOT/support/__EMSCRIPTEN__/
+    mv $PREFIX/lib/python3.??/lib-dynload/* $ROOT/prebuilt/emsdk/site-packages
 
     # specific platform support
     cp -Rfv $ROOT/support/__EMSCRIPTEN__.patches/. $HOST_PREFIX/lib/python3.??/
 
     # TODO: use PYTHONPATH for python3-wasm to pick them in devices/emsdk/usr/lib/python3.11/
     #ln $PREFIX/lib/python3.??/_sysconfigdata__emscripten_wasm32-emscripten.py devices/x86_64/usr/lib/python3.??/
 
-    mkdir -p prebuilt
-    cp -vf build/cpython-wasm/libpython3.*.a prebuilt/
+
+    cp -vf build/cpython-wasm/libpython3.*.a prebuilt/emsdk/
     rmdir  $PREFIX/lib/python3.??/lib-dynload
 fi
 
@@ -182,49 +184,45 @@ cat > $HOST_PREFIX/bin/cc <<END
 unset _PYTHON_SYSCONFIGDATA_NAME
 unset PYTHONHOME
 unset PYTHONPATH
-for py in 10 9 8 7
-do
-    if command -v python3.${py}
-    then
-        export EMSDK_PYTHON=$(command -v python3.${py})
-        break
-    fi
-done
+
+SHARED="-Wno-unused-command-line-argument"
+IS_SHARED=false
 
 for arg do
     shift
+
+    # that is for some very bad setup.py behaviour regarding cross compiling. should not be needed ..
     [ "\$arg" = "-I/usr/include" ] && continue
     [ "\$arg" = "-I/usr/include/SDL2" ] && continue
     [ "\$arg" = "-L/usr/lib64" ]	&& continue
     [ "\$arg" = "-L/usr/lib" ]   && continue
-    set -- "\$@" "\$arg"
-done
 
-SHARED=""
-IS_SHARED=false
+    if [ "\$arg" = "-shared" ]
+    then
+        IS_SHARED=true
+        SHARED="$SHARED -sSIDE_MODULE"
+    fi
 
-if echo \$@|grep -q shared
-then
-    IS_SHARED=true
-    SHARED="-sSIDE_MODULE"
-else
-    if echo \$@|grep -q wasm32-emscripten.so
+    if echo "\$arg"|grep -q wasm32-emscripten.so\$
     then
         IS_SHARED=true
-        SHARED="-shared -sSIDE_MODULE"
+        SHARED="$SHARED -shared -sSIDE_MODULE"
     fi
-fi
+    set -- "\$@" "\$arg"
+done
+
 
 if \$IS_SHARED
 then
-    # $COPTS
-    emcc \$SHARED $COPTS $LDFLAGS -sSIDE_MODULE -gsource-map --source-map-base / \$@
+    $SYS_PYTHON -E $EMSDK/upstream/emscripten/emcc.py \
+        \$SHARED $COPTS $LDFLAGS -sSIDE_MODULE -gsource-map --source-map-base / \$@
 else
-    # $COPTS
-    emcc $COPTS $CPPFLAGS -DBUILD_STATIC \$@
+    $SYS_PYTHON -E $EMSDK/upstream/emscripten/emcc.py \
+        $COPTS $CPPFLAGS -DBUILD_STATIC \$@
 fi
 END
 
+
 chmod +x $HOST_PREFIX/bin/cc
 
 cat > ${PYTHONPYCACHEPREFIX}/.nanorc <<END

scripts/cpython-build-host-deps.sh

@@ -1,12 +1,13 @@
 . ${CONFIG:-config}
 
 echo "
-    *cpython-build-host-deps*
+    *cpython-build-host-deps pip==$PIP *
 " 1>&2
 
 
 # https://stackoverflow.com/questions/6301003/stopping-setup-py-from-installing-as-egg
 # python3 setup.py install --single-version-externally-managed --root=/
+SPY="$HPY setup.py install --single-version-externally-managed --root=/"
 
 # just in case
 $PIP install pip --upgrade
@@ -81,16 +82,16 @@ pushd cffi-branch-default
 popd
 
 
-# cython 3 ( not out yet )
-if $HPY -m cython -V 2>&1|grep -q 'version 3.0.'
-then
-    echo  found cython 3+
-else
-    git_update https://github.com/cython/cython
-    pushd cython
-    $PIP install .
-    popd
-fi
+## cython 3 ( not out yet )
+#if $HPY -m cython -V 2>&1|grep -q 'version 3.0.'
+#then
+#    echo  found cython 3+
+#else
+#    git_update https://github.com/cython/cython
+#    pushd cython
+#    $PIP install .
+#    popd
+#fi
 
 
 if [ -d pymunk-4.0.0 ]
@@ -100,8 +101,8 @@ then
     [ -d $HOST_PREFIX/lib/python3.11/site-packages/pymunk4 ] && rm -rf $HOST_PREFIX/lib/python3.11/site-packages/pymunk4
     rm -f  build/lib/pymunk/* chipmunk_src/*.so chipmunk_src/*/*.o
     $HPY setup.py build_chipmunk
-    $HPY setup.py install
-    mv pymunk/libchipmunk.so $HOST_PREFIX/lib/python3.11/site-packages/pymunk/libchipmunk64.so
+    $SPY
+    mv $HOST_PREFIX/lib/python3.11/site-packages/pymunk/libchipmunk.so $HOST_PREFIX/lib/python3.11/site-packages/pymunk/libchipmunk64.so
     mv $HOST_PREFIX/lib/python3.11/site-packages/pymunk $HOST_PREFIX/lib/python3.11/site-packages/pymunk4
     popd
 fi

scripts/cpython-build-host.sh

@@ -15,7 +15,7 @@ else
     if [ -f ${PYTHON_FOR_BUILD} ]
     then
         REBUILD=false
-        echo "  * will *RE-USE* PYTHON_FOR_BUILD found at ${PYTHON_FOR_BUILD}"
+        echo "  * will *RE-USE* PYTHON_FOR_BUILD found at ${PYTHON_FOR_BUILD}" 1>&2
     else
         REBUILD=true
     fi
@@ -31,7 +31,7 @@ then
 
 
 #export OPT="$CPOPTS -DNDEBUG -fwrapv"
-    cat $ROOT/src/cpython/Tools/wasm/config.host-wasm32-emscripten <<END
+    cat > $ROOT/src/cpython/Tools/wasm/config.host-wasm32-emscripten <<END
 ac_cv_lib_intl_textdomain=no
 ac_cv_func_bind_textdomain_codeset=no
 END
@@ -45,10 +45,12 @@ END
 
     cat >> pyconfig.h <<END
 #ifdef HAVE_LIBINTL_H
+#warning "HAVE_LIBINTL_H but We do not want to link to libintl"
 #undef HAVE_LIBINTL_H
 #endif
 
 #ifdef WITH_LIBINTL
+#warning "WITH_LIBINTL but We do not want to link to libintl"
 #undef WITH_LIBINTL
 #endif
 
@@ -59,20 +61,20 @@ END
     # Prevent freezing bytecode with a different magic
     rm -f $HOST_PREFIX/bin/python3*
 
-    if which python3.11|grep -q python
+    if command -v python3.11
     then
         echo "
 
-
     ===================================================================================
 
-            it's not safe to have a python3.11 in the path while in pre-release cycle
-            _sre.MAGIC / bytecode weird errors etc ...
+            it's not safe to have a python3.11 in the path :
+                $(command -v python3.11)
+            while in pre-release cycle : _sre.MAGIC / bytecode weird errors etc ...
 
     ===================================================================================
 
-"
-        sleep 3
+" 1>&2
+        sleep 6
     fi
 
 # OPT="$OPT"
@@ -96,7 +98,7 @@ END
 
     reminder: you need clang libffi-dev and usual cpython requirements.
 ==========================================================================
-    "
+    " 1>&2
         exit 1
     fi
 
@@ -108,7 +110,7 @@ else
 
     *   cpython host already built :
             PYTHON_FOR_BUILD=${PYTHON_FOR_BUILD}
-"
+" 1>&2
 fi
 
 

scripts/emsdk-fetch.sh

@@ -40,15 +40,17 @@ then
         exit 1
     fi
 
-    # 3.6 could have problems
-    for py in 10 9 8 7
-    do
-        if command -v python3.${py} >/dev/null
-        then
-            export EMSDK_PYTHON=$(command -v python3.${py})
-            break
-        fi
-    done
+# EMSDK_PYTHON is cleared
+# https://github.com/emscripten-core/emscripten/pull/16736
+#    # 3.6 could have problems
+#    for py in 10 9 8 7
+#    do
+#        if command -v python3.${py} >/dev/null
+#        then
+#            export EMSDK_PYTHON=$(command -v python3.${py})
+#            break
+#        fi
+#    done
 
 
 
@@ -92,23 +94,34 @@ unset PYTHONPATH
 SHARED=""
 IS_SHARED=false
 
-if echo "\$@"|grep -q shared
-then
-    IS_SHARED=true
-    SHARED="-sSIDE_MODULE"
-else
-    if echo "\$@"|grep -q wasm32-emscripten.so
+for arg do
+    shift
+
+    # that is for some very bad setup.py behaviour regarding cross compiling. should not be needed ..
+    [ "\$arg" = "-I/usr/include" ] && continue
+    [ "\$arg" = "-I/usr/include/SDL2" ] && continue
+    [ "\$arg" = "-L/usr/lib64" ]	&& continue
+    [ "\$arg" = "-L/usr/lib" ]   && continue
+
+    if [ "\$arg" = "-shared" ]
     then
         IS_SHARED=true
-        SHARED="-shared -sSIDE_MODULE"
+        SHARED="$SHARED -sSIDE_MODULE"
     fi
-fi
+
+    if echo "\$arg"|grep -q wasm32-emscripten.so\$
+    then
+        IS_SHARED=true
+        SHARED="$SHARED -shared -sSIDE_MODULE"
+    fi
+    set -- "\$@" "\$arg"
+done
 
 if \$IS_SHARED
 then
-    \$SYS_PYTHON -E \$0.py $SHARED $LDFLAGS -Wno-unused-command-line-argument "\$@"
+    \$SYS_PYTHON -E \$0.py $SHARED $LDFLAGS "\$@"
 else
-    \$SYS_PYTHON -E \$0.py $CPPFLAGS -Wno-unused-command-line-argument "\$@"
+    \$SYS_PYTHON -E \$0.py $CPPFLAGS "\$@"
 fi
 END
         cat emsdk/upstream/emscripten/emcc > emsdk/upstream/emscripten/em++