diff --git a/scripts/cpython-build-emsdk.sh b/scripts/cpython-build-emsdk.sh index 541b836..d8441e8 100755 --- 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 index 5ac7ffb..2a00cb2 100755 --- 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 index 96a5110..ca3f6ed 100644 --- 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,7 +46,7 @@ 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 @@ -80,23 +54,31 @@ 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 @@ -104,7 +86,6 @@ then emmake make install fi fi - popd fi fi diff --git a/support/__EMSCRIPTEN__.deps/ncurses-6.1_emscripten_makew.patch b/support/__EMSCRIPTEN__.deps/ncurses-6.1_emscripten_makew.patch index 62b9c2c..95d0472 100644 --- a/support/__EMSCRIPTEN__.deps/ncurses-6.1_emscripten_makew.patch +++ b/support/__EMSCRIPTEN__.deps/ncurses-6.1_emscripten_makew.patch @@ -6,139 +6,139 @@ cd form && ${MAKE} ${TOP_MFLAGS} $@ - cd misc && ${MAKE} ${TOP_MFLAGS} $@ +# cd misc && ${MAKE} ${TOP_MFLAGS} $@ - + libs \ install.libs \ --- ncurses/ncurses/Makefile 2022-04-26 01:52:09.054768171 +0200 +++ ncurses-wasm/ncurses/Makefile 2022-04-26 01:53:20.566040262 +0200 @@ -49,14 +49,14 @@ - VPATH = /data/git/python-wasm-plus/src/ncurses-6.1/ncurses + VPATH = /opt/python-wasm-sdk/src/ncurses-6.1/ncurses THIS = Makefile - --CF_MFLAGS = + +-CF_MFLAGS = +CF_MFLAGS = - - --x = + + +-x = +x = o = .o - + MODEL = normal --DESTDIR = +-DESTDIR = +DESTDIR = - top_srcdir = /data/git/python-wasm-plus/src/ncurses-6.1 - srcdir = /data/git/python-wasm-plus/src/ncurses-6.1/ncurses - prefix = /data/git/python-wasm-plus/devices/emsdk/usr + top_srcdir = /opt/python-wasm-sdk/src/ncurses-6.1 + srcdir = /opt/python-wasm-sdk/src/ncurses-6.1/ncurses + prefix = /opt/python-wasm-sdk/devices/emsdk/usr @@ -72,14 +72,14 @@ - + PACKAGE = ncursesw - --LIBTOOL = --LIBTOOL_OPTS = --LIBTOOL_CLEAN = --LIBTOOL_COMPILE = + +-LIBTOOL = +-LIBTOOL_OPTS = +-LIBTOOL_CLEAN = +-LIBTOOL_COMPILE = +LIBTOOL = +LIBTOOL_OPTS = +LIBTOOL_CLEAN = +LIBTOOL_COMPILE = LIBTOOL_LINK = ${CC} --LIBTOOL_INSTALL = --LIBTOOL_UNINSTALL = --LT_UNDEF = +-LIBTOOL_INSTALL = +-LIBTOOL_UNINSTALL = +-LT_UNDEF = +LIBTOOL_INSTALL = +LIBTOOL_UNINSTALL = +LT_UNDEF = - + INSTALL = /usr/bin/install -c INSTALL_LIB = /usr/bin/install -c -m 644 @@ -94,7 +94,7 @@ - NM = /data/git/python-wasm-plus/emsdk/upstream/bin/llvm-nm - + NM = /opt/python-wasm-sdk/emsdk/upstream/bin/llvm-nm + CTAGS = ctags --ETAGS = +-ETAGS = +ETAGS = - - CC = /data/git/python-wasm-plus/emsdk/upstream/emscripten/emcc - CPP = /data/git/python-wasm-plus/emsdk/upstream/emscripten/emcc -E + + CC = /opt/python-wasm-sdk/emsdk/upstream/emscripten/emcc + CPP = /opt/python-wasm-sdk/emsdk/upstream/emscripten/emcc -E @@ -105,7 +105,7 @@ - + CCFLAGS = $(CPPFLAGS) $(CFLAGS) - --BUILD_CPPFLAGS = -DHAVE_CONFIG_H -DUSE_BUILD_CC -I../ncurses -I$(srcdir) -I../include -I$(INCDIR) ${CPPFLAGS} + +-BUILD_CPPFLAGS = -DHAVE_CONFIG_H -DUSE_BUILD_CC -I../ncurses -I$(srcdir) -I../include -I$(INCDIR) ${CPPFLAGS} +BUILD_CPPFLAGS = -DHAVE_CONFIG_H -DUSE_BUILD_CC -I../ncurses -I$(srcdir) -I../include -I$(INCDIR) ${CPPFLAGS} BUILD_CC = ${CC} BUILD_CCFLAGS = ${CFLAGS} BUILD_LDFLAGS = ${LDFLAGS} @@ -115,7 +115,7 @@ # is compiled into the build, or are test-programs that are not installed. - + BUILD_EXEEXT = $x --x = +-x = +x = - + CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) @@ -126,16 +126,16 @@ CFLAGS_DEFAULT = $(CFLAGS_NORMAL) - + LINK = $(LIBTOOL) --LDFLAGS = -L/data/git/python-wasm-plus/devices/emsdk/usr/lib -+LDFLAGS = -L/data/git/python-wasm-plus/devices/emsdk/usr/lib - +-LDFLAGS = -L/opt/python-wasm-sdk/devices/emsdk/usr/lib ++LDFLAGS = -L/opt/python-wasm-sdk/devices/emsdk/usr/lib + SHLIB_DIRS = -L../lib --SHLIB_LIST = $(SHLIB_DIRS) --TINFO_LIST = $(SHLIB_DIRS) --TICS_LIST = $(SHLIB_DIRS) +-SHLIB_LIST = $(SHLIB_DIRS) +-TINFO_LIST = $(SHLIB_DIRS) +-TICS_LIST = $(SHLIB_DIRS) +SHLIB_LIST = $(SHLIB_DIRS) +TINFO_LIST = $(SHLIB_DIRS) +TICS_LIST = $(SHLIB_DIRS) - + RPATH_LIST = ${libdir} --RESULTING_SYMS = --VERSIONED_SYMS = +-RESULTING_SYMS = +-VERSIONED_SYMS = +RESULTING_SYMS = +VERSIONED_SYMS = MK_SHARED_LIB = ${CC} ${LDFLAGS} ${CFLAGS} -shared -Wl,-soname,`basename $@ .${REL_VERSION}`.${ABI_VERSION},-stats,-lc -o $@ - + NCURSES_MAJOR = 6 @@ -147,11 +147,11 @@ - + LIBRARIES = ../lib/libncursesw.a ../lib/libncursesw_g.a - --LINT = --LINT_OPTS = --LINT_LIBS = -lncurses + +-LINT = +-LINT_OPTS = +-LINT_LIBS = -lncurses +LINT = +LINT_OPTS = +LINT_LIBS = -lncurses - --FALLBACK_LIST = + +-FALLBACK_LIST = +FALLBACK_LIST = - + USE_BIG_STRINGS = 1 TERMINFO_CAPS = $(top_srcdir)/include/Caps @@ -186,7 +186,7 @@ $(INCDIR)/nc_mingw.h - + TEST_DEPS = ../lib/libncursesw.a --TEST_ARGS = -static -L../lib -lformw -lmenuw -lpanelw -lncursesw -dynamic +-TEST_ARGS = -static -L../lib -lformw -lmenuw -lpanelw -lncursesw -dynamic +TEST_ARGS = -static -L../lib -lformw -lmenuw -lpanelw -lncursesw -dynamic - TEST_LDFLAGS = $(TEST_ARGS) -L/data/git/python-wasm-plus/devices/emsdk/usr/lib - + TEST_LDFLAGS = $(TEST_ARGS) -L/opt/python-wasm-sdk/devices/emsdk/usr/lib + TEST_PROGS = \ @@ -208,7 +208,7 @@ ################################################################################ all libs :: $(AUTO_SRC) ../lib $(LIBRARIES) - --all libs :: report_offsets$(BUILD_EXEEXT) + +-all libs :: report_offsets$(BUILD_EXEEXT) +all libs :: report_offsets$(BUILD_EXEEXT) - + sources: $(AUTO_SRC) - + @@ -230,20 +230,20 @@ keys.list : $(tinfo)/MKkeys_list.sh AWK=$(AWK) $(SHELL) $(tinfo)/MKkeys_list.sh $(TERMINFO_CAPS) | LC_ALL=C sort >$@ - + -make_keys$(BUILD_EXEEXT) : \ - $(tinfo)/make_keys.c \ - names.c @@ -167,11 +167,11 @@ +# $(srcdir)/report_offsets.c +# $(BUILD_CC) -o $@ $(BUILD_CPPFLAGS) $(BUILD_CCFLAGS) $(srcdir)/report_offsets.c $(BUILD_LDFLAGS) $(BUILD_LIBS) +# ./report_offsets$(BUILD_EXEEXT) - + ./expanded.c : $(srcdir)/curses.priv.h $(serial)/MKexpanded.sh $(SHELL) -e $(serial)/MKexpanded.sh "$(CPP)" $(CPPFLAGS) > $@ @@ -280,9 +280,9 @@ - + clean :: mostlyclean -rm -f $(AUTO_SRC) - -rm -f make_keys$(BUILD_EXEEXT) @@ -181,43 +181,43 @@ +# -rm -f make_hash$(BUILD_EXEEXT) +# -rm -f report_offsets$(BUILD_EXEEXT) -rm -rf .libs *.dSYM *.map - + distclean :: clean @@ -327,7 +327,7 @@ ############################################################################### - + # Generated by CF_LIB_RULES --resulting.map: +-resulting.map: +resulting.map: gawk 'BEGIN { skip = 1; last=""; } /deprecated in ABI6/ { next; }{ sub("NCURSES([WT]+)?", "&6"); } { if ( last != "" && ( skip == 0 || $$0 !~ /}/ ) ) { print last; } skip = 0; last = $$0; } END { print last; }' < >$@ - + distclean:: @@ -336,8 +336,8 @@ # generated by mk-0th.awk # libname: ncursesw # subsets: ticlib+termlib+ext_tinfo+base+widechar+ext_funcs --# ticlib: --# termlib: +-# ticlib: +-# termlib: +# ticlib: +# termlib: - + .SUFFIXES: .c .cc .h .i .ii .c.i : @@ -945,7 +945,7 @@ # echo: no # subset: ticlib+termlib+ext_tinfo+base+widechar+ext_funcs # crenames: yes --# cxxrenames: +-# cxxrenames: +# cxxrenames: # traces: DEBUG - # srcdir: /data/git/python-wasm-plus/src/ncurses-6.1 - + # srcdir: /opt/python-wasm-sdk/src/ncurses-6.1 + @@ -2083,7 +2083,7 @@ # echo: no # subset: ticlib+termlib+ext_tinfo+base+widechar+ext_funcs # crenames: yes --# cxxrenames: +-# cxxrenames: +# cxxrenames: # traces: DEBUG - # srcdir: /data/git/python-wasm-plus/src/ncurses-6.1 - + # srcdir: /opt/python-wasm-sdk/src/ncurses-6.1 +