3.1.69.7bi

Author: pmp-p

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
        BUILDS: 3.12 3.13 3.14
-       EMFLAVOUR: tot
+       EMFLAVOUR: latest
 
     steps:
     - uses: actions/[email protected]

emsdk-cc

@@ -141,8 +141,13 @@ for argc, arg in enumerate(sys.argv):
     if arg.startswith('--preload-file') or arg.startswith('--embed-file'):
         USE_RAWFS = False
 
-    if arg.find("MAIN_MODULE") > 0 or EXE.endswith(".cjs") or EXE.endswith(".js"):
+    if arg.find("MAIN_MODULE") > 0:
         MAIN_MODULE = True
+    elif EXE.endswith(".cjs") or EXE.endswith(".js") or EXE.endswith(".html"):
+        MAIN_MODULE = True
+
+    if arg == "-sENVIRONMENT=web":
+        EXE = False
 
     if arg.lower() in ("-fpic", "-latomic"):
         continue
@@ -170,11 +175,10 @@ for argc, arg in enumerate(sys.argv):
             COMPILE = True
         # TODO maybe add node runner for a .cjs
         elif arg == "-o":
+            EXE_POS = argc + 1
             if IS_SHARED:
-                EXE_POS = argc + 1
                 SHARED_TARGET = sys.argv[EXE_POS]
-            else:
-                EXE_POS = argc + 1
+            elif EXE=="":
                 EXE = sys.argv[EXE_POS]
 
     elif arg.endswith(".so") or arg == "-shared" or arg.find("SIDE_MODULE") > 0:
@@ -247,10 +251,12 @@ if SKIP:
 else:
     # should not happen
     if EXE:
-        if EXE.endswith('.o') and '-c' not in out:
+        if EXE.endswith('.o')  and '-c' not in out:
             final.append('-c')
             EXE = False
             MAIN_MODULE = False
+        elif EXE.endswith('.html'):
+            EXE = False
 
     if EXE:
         if EXE.endswith(".cjs") or EXE.endswith(".js"):

sources.wasm/5000-ncurses-65.sh

@@ -0,0 +1,92 @@
+#!/bin/bash
+
+. ${CONFIG:-config}
+
+. scripts/emsdk-fetch.sh
+
+# --disable-database --enable-termcap
+
+NCOPTS="--enable-ext-colors --enable-ext-mouse --prefix=$PREFIX --disable-echo --without-pthread \
+ --without-tests --without-tack --without-progs --without-manpages \
+ --disable-db-install --without-cxx --without-cxx-binding --enable-pc-files \
+ --with-pkg-config-libdir=$PREFIX/lib/pkgconfig \
+ --with-termlib --enable-termcap --disable-database"
+
+
+export NCURSES=${NCURSES:-"ncurses-6.5"}
+export URL_NCURSES=${URL_NCURSES:-"https://invisible-mirror.net/archives/ncurses/$NCURSES.tar.gz"}
+
+if cd ${ROOT}/src
+then
+
+    wget -c $URL_NCURSES && tar xfz $NCURSES.tar.gz
+
+    if cd ${ROOT}/src/$NCURSES
+    then
+        [ -f $NCURSES.done ] || patch -p1 < $SDKROOT/support/__EMSCRIPTEN__.deps/${NCURSES}_emscripten.patch
+        touch $NCURSES.done
+    fi
+
+    cd $ROOT
+    mkdir -p ${ROOT}/build/ncurses/
+
+    if  [ -f ../devices/emsdk/usr/lib/libncurses.a ]
+    then
+        echo "
+            * skiping [ncurses] or already built
+        " 1>&2
+    else
+        rm -rf ${ROOT}/build/ncurses/*
+        cd ${ROOT}/build/ncurses
+
+        #CC=clang CFLAGS="-fpic -Wno-unused-command-line-argument" $ROOT/src/${NCURSES}/configure \
+        # $NCOPTS && make && make install
+
+        CFLAGS="-fpic -Wno-unused-command-line-argument" emconfigure \
+         $ROOT/src/${NCURSES}/configure \
+         $NCOPTS
+
+        if true #patch -p1 < $SDKROOT/support/__EMSCRIPTEN__.deps/${NCURSES}_emscripten_make.patch
+        then
+            emmake make clean
+            if emmake make
+            then
+                emmake make install
+            fi
+        fi
+    fi
+
+    cd $ROOT
+    mkdir -p ${ROOT}/build/ncurses/
+
+    if [ -f devices/emsdk/usr/lib/libncursesw.a ]
+    then
+        echo "
+            * ncursesw already built
+        "  1>&2
+    else
+        # build wide char
+        rm -rf ${ROOT}/build/ncurses/*
+
+        cd ${ROOT}/build/ncurses
+
+        #CC=clang CFLAGS="-fpic -Wno-unused-command-line-argument" $ROOT/src/${NCURSES}/configure \
+        # $NCOPTS --enable-widec && make && make install
+
+        CFLAGS="-fpic -Wno-unused-command-line-argument" emconfigure \
+         $ROOT/src/${NCURSES}/configure $NCOPTS --enable-widec
+
+        cp ncurses/Makefile ncurses/Makefile.makew
+
+        if true #patch -p0 < $SDKROOT/support/__EMSCRIPTEN__.deps/${NCURSES}_emscripten_makew.patch
+        then
+            emmake make clean
+            if emmake make
+            then
+                emmake make install
+            fi
+        fi
+    fi
+
+fi
+