fix ncurses third party

pygame-web · Sep 8, 2023 · 338b5f8 · 338b5f8
1 parent 16ac0a6
commit 338b5f8
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 123 deletions.
diff --git a/scripts/cpython-build-emsdk.sh b/scripts/cpython-build-emsdk.sh
@@ -313,6 +313,8 @@ export PATH=\${CARGO_HOME}/bin:\$PATH
 export PANDA_PRC_DIR=${SDKROOT}/support
 
 export EMSDK_QUIET=1
+export EM_IGNORE_SANITY=1
+export EMCC_SKIP_SANITY_CHECK=1
 
 if [[ ! -z \${EMSDK+z} ]]
 then

diff --git a/scripts/cpython-fetch.sh b/scripts/cpython-fetch.sh
@@ -67,9 +67,9 @@ fi
 
 if echo $PYBUILD | grep -q 11$
 then
-    wget -q -c https://www.python.org/ftp/python/3.11.4/Python-3.11.4.tar.xz
-    tar xf Python-3.11.4.tar.xz
-    ln -s Python-3.11.4 cpython${PYBUILD}
+    wget -q -c https://www.python.org/ftp/python/3.11.5/Python-3.11.5.tar.xz
+    tar xf Python-3.11.5.tar.xz
+    ln -s Python-3.11.5 cpython${PYBUILD}
     export REBUILD=true
 fi
 

diff --git a/sources.wasm/ncurses.sh b/sources.wasm/ncurses.sh
@@ -4,9 +4,6 @@
 
 . scripts/emsdk-fetch.sh
 
-
-cd ${ROOT}/src
-
 # --disable-database --enable-termcap
 
 NCOPTS="--enable-ext-colors --enable-ext-mouse --prefix=$PREFIX --disable-echo --without-pthread \
@@ -17,53 +14,30 @@ NCOPTS="--enable-ext-colors --enable-ext-mouse --prefix=$PREFIX --disable-echo -
 
 
 export NCURSES=${NCURSES:-"ncurses-6.1"}
-export URL_NCURSES=${URL_NCURSES:-"URL https://ftp.NCURSES.org/source/$NCURSES.tar.gz"}
-export HASH_NCURSES=${HASH_NCURSES:-"URL_HASH SHA256=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17"}
-
-
+export URL_NCURSES=${URL_NCURSES:-"https://invisible-mirror.net/archives/ncurses/$NCURSES.tar.gz"}
 
-if true
+if cd ${ROOT}/src
 then
 
-    wget -q -c $URL_NCURSES && tar xfz $NCURSES.tar.gz
-
-    pushd $NCURSES
-    [ -f $NCURSES.done ] || patch -p1 < $ROOT/support/__EMSCRIPTEN__.deps/ncurses-6.1_emscripten.patch
-    touch $NCURSES.done
-    popd
-
-
-    cd $ROOT
+    wget -c $URL_NCURSES && tar xfz $NCURSES.tar.gz
 
-    if [ -f devices/emsdk/usr/lib/libncursesw.a ]
+    if cd ${ROOT}/src/$NCURSES
     then
-        echo "
-            * ncursesw already built
-        "  1>&2
-    else
-        mkdir -p build/ncurses/
-
-        # build wide char
-        rm -rf build/ncurses/*
-
-        pushd build/ncurses
-        make clean
-        CC=clang CFLAGS="-fpic -Wno-unused-command-line-argument" $ROOT/src/ncurses-6.1/configure \
-         $NCOPTS --enable-widec && make && make install
-
-        popd
+        [ -f $NCURSES.done ] || patch -p1 < $SDKROOT/support/__EMSCRIPTEN__.deps/ncurses-6.1_emscripten.patch
+        touch $NCURSES.done
     fi
 
+    cd $ROOT
+    mkdir -p ${ROOT}/build/ncurses/
 
-
-    if  false #[ -f ../devices/emsdk/usr/lib/libncurses.a ]
+    if  [ -f ../devices/emsdk/usr/lib/libncurses.a ]
     then
         echo "
             * skiping [ncurses] or already built
         " 1>&2
     else
-        rm -rf ../build/ncurses/*
-        pushd ../build/ncurses
+        rm -rf ${ROOT}/build/ncurses/*
+        cd ${ROOT}/build/ncurses
 
         CC=clang CFLAGS="-fpic -Wno-unused-command-line-argument" $ROOT/src/ncurses-6.1/configure \
          $NCOPTS && make && make install
@@ -72,39 +46,46 @@ then
          $ROOT/src/ncurses-6.1/configure \
          $NCOPTS
 
-        if patch -p1 < $ROOT/support/__EMSCRIPTEN__.deps/ncurses-6.1_emscripten_make.patch
+        if patch -p1 < $SDKROOT/support/__EMSCRIPTEN__.deps/ncurses-6.1_emscripten_make.patch
         then
             emmake make clean
             if emmake make
             then
                 emmake make install
             fi
         fi
-        popd
     fi
 
+    cd $ROOT
+    mkdir -p ${ROOT}/build/ncurses/
 
-    if [ -f ../devices/emsdk/usr/lib/libncursesw.a ]
+    if [ -f devices/emsdk/usr/lib/libncursesw.a ]
     then
         echo "
             * ncursesw already built
         "  1>&2
     else
         # build wide char
-        pushd ../build/ncurses
+        rm -rf ${ROOT}/build/ncurses/*
+
+        cd ${ROOT}/build/ncurses
+
+        CC=clang CFLAGS="-fpic -Wno-unused-command-line-argument" $ROOT/src/ncurses-6.1/configure \
+         $NCOPTS --enable-widec && make && make install
 
         CFLAGS="-fpic -Wno-unused-command-line-argument" emconfigure \
          $ROOT/src/ncurses-6.1/configure $NCOPTS --enable-widec
 
-        if patch -p1 < $SDKROOT/support/__EMSCRIPTEN__.deps/ncurses-6.1_emscripten_makew.patch
+        cp ncurses/Makefile ncurses/Makefile.makew
+
+        if patch -p0 < $SDKROOT/support/__EMSCRIPTEN__.deps/ncurses-6.1_emscripten_makew.patch
         then
             emmake make clean
             if emmake make
             then
                 emmake make install
             fi
         fi
-        popd
     fi
 
 fi