From 4a0782298f87b24a65b8fae207543b359949771d Mon Sep 17 00:00:00 2001 From: pmp-p Date: Wed, 31 Jul 2024 10:03:36 +0200 Subject: [PATCH] add ossp-uuid --- python-wasi-sdk.sh | 2 +- python-wasm-sdk.sh | 2 +- scripts/emsdk-fetch.sh | 4 ++ sources.wasm/{libicu.sh => libxml2-libicu.sh} | 2 + sources.wasm/libxml2.sh | 2 + sources.wasm/uuid-ossp.sh | 56 +++++++++++++++++++ 6 files changed, 66 insertions(+), 2 deletions(-) rename sources.wasm/{libicu.sh => libxml2-libicu.sh} (97%) create mode 100755 sources.wasm/uuid-ossp.sh diff --git a/python-wasi-sdk.sh b/python-wasi-sdk.sh index 96b6ff5..6b5c0fa 100755 --- a/python-wasi-sdk.sh +++ b/python-wasi-sdk.sh @@ -196,8 +196,8 @@ END parse_git_branch() { git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/' } - export PS1="[PyDK:wasi] \[\e[32m\]\w \[\e[91m\]\$(parse_git_branch)\[\e[00m\]\$ " +export PS1="[PyDK:wasi] \[\e[32m\]\w \[\e[91m\]\$(parse_git_branch)\[\e[00m\]\$ " END chmod +x ${SDKROOT}/python3-wasi ${SDKROOT}/wasm32-wasi-shell.sh diff --git a/python-wasm-sdk.sh b/python-wasm-sdk.sh index 96b6ff5..6b5c0fa 100755 --- a/python-wasm-sdk.sh +++ b/python-wasm-sdk.sh @@ -196,8 +196,8 @@ END parse_git_branch() { git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/' } - export PS1="[PyDK:wasi] \[\e[32m\]\w \[\e[91m\]\$(parse_git_branch)\[\e[00m\]\$ " +export PS1="[PyDK:wasi] \[\e[32m\]\w \[\e[91m\]\$(parse_git_branch)\[\e[00m\]\$ " END chmod +x ${SDKROOT}/python3-wasi ${SDKROOT}/wasm32-wasi-shell.sh diff --git a/scripts/emsdk-fetch.sh b/scripts/emsdk-fetch.sh index 20a8109..434cadf 100755 --- a/scripts/emsdk-fetch.sh +++ b/scripts/emsdk-fetch.sh @@ -480,6 +480,7 @@ END export PKG_CONFIG_SYSROOT_DIR="${SDKROOT}/devices/emsdk" export PKG_CONFIG_LIBDIR="${SDKROOT}/emsdk/upstream/emscripten/system/lib/pkgconfig" export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${HOST_PREFIX}/lib/pkgconfig" + export EM_PKG_CONFIG_PATH=$PKG_CONFIG_PATH if echo $PATH|grep -q $EMSDK/upstream/emscripten/system/bin then @@ -489,6 +490,9 @@ END export PATH=$EMSDK/upstream/emscripten/system/bin:$EMSDK/upstream/emscripten:$PATH fi + #ln $EMSDK/upstream/emscripten/emstrip $EMSDK/upstream/emscripten/strip + #ln $EMSDK/upstream/emscripten/emstrip.py $EMSDK/upstream/emscripten/strip.py + mkdir -p ${SDKROOT}/devices/$(arch)/usr/bin/ cp $SDKROOT/wasisdk/bin/wasm-objdump* ${SDKROOT}/devices/$(arch)/usr/bin/ diff --git a/sources.wasm/libicu.sh b/sources.wasm/libxml2-libicu.sh similarity index 97% rename from sources.wasm/libicu.sh rename to sources.wasm/libxml2-libicu.sh index 63727b0..45004d7 100755 --- a/sources.wasm/libicu.sh +++ b/sources.wasm/libxml2-libicu.sh @@ -1,5 +1,7 @@ #!/bin/bash +. ${CONFIG:-config} + . scripts/emsdk-fetch.sh cd ${ROOT}/src diff --git a/sources.wasm/libxml2.sh b/sources.wasm/libxml2.sh index 37b764a..0454652 100755 --- a/sources.wasm/libxml2.sh +++ b/sources.wasm/libxml2.sh @@ -1,5 +1,7 @@ #!/bin/bash +. ${CONFIG:-config} + . scripts/emsdk-fetch.sh diff --git a/sources.wasm/uuid-ossp.sh b/sources.wasm/uuid-ossp.sh new file mode 100755 index 0000000..9c696bb --- /dev/null +++ b/sources.wasm/uuid-ossp.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +. ${CONFIG:-config} + +. scripts/emsdk-fetch.sh + +cd ${ROOT}/src + +if [ -d icu ] +then + echo ok +else + wget -c http://www.mirrorservice.org/sites/ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz + tar xfz uuid-1.6.2.tar.gz +fi + +if [ -f $PREFIX/lib/libossp-uuid.a ] +then + echo " + already built in $PREFIX/lib/ + " +else + + mkdir -p $ROOT/build/libuuid + cat > config.site <