Commit 72965762 authored by jan.koester's avatar jan.koester
Browse files

test

parent 7c8b3998

packaging/build-nspawn.sh

+16 −14
Original line number Diff line number Diff line
@@ -393,16 +393,17 @@ build_libraries() { 
        ensure_icupkg() {

            local c

            for c in \

                /usr/local/bin/icupkg \

                \$PREFIX/icu-host/bin/icupkg \

                \$PREFIX/icu-host/sbin/icupkg \

                /build/libs/icu/icu4c/source/build-host/bin/icupkg

                /build/libs/icu/icu4c/source/build-host/bin/icupkg \

                /usr/local/bin/icupkg

            do

                if [ -x "\$c" ]; then

                    ln -sf "\$c" /usr/local/bin/icupkg

                    ICUPKG_BIN="\$c"

                    return 0

                fi

            done

            ICUPKG_BIN=

            return 1

        }
@@ -521,11 +522,11 @@ build_libraries() { 
                echo \"FATAL: icupkg is not available for node build\" >&2

                exit 1

            fi

            ICUPKG_REAL=\$(readlink -f /usr/local/bin/icupkg || true)

            if [ ! -x /usr/local/bin/icupkg ]; then

                echo \"FATAL: /usr/local/bin/icupkg is not executable (resolved: \$ICUPKG_REAL)\" >&2

            if [ -z "\$ICUPKG_BIN" ] || [ ! -x "\$ICUPKG_BIN" ]; then

                echo "FATAL: detected icupkg path is invalid: \$ICUPKG_BIN" >&2

                exit 1

            fi

            ln -sf "\$ICUPKG_BIN" /usr/local/bin/icupkg

            cd nodejs

            export CC=/usr/local/musl/bin/musl-clang

            export CXX=/usr/local/musl/bin/musl-clang++
@@ -536,7 +537,7 @@ build_libraries() { 
            ./configure --prefix=\$PREFIX --without-npm

            mkdir -p out/Release

            rm -f out/Release/icupkg

            install -m 0755 /usr/local/bin/icupkg out/Release/icupkg

            install -m 0755 "\$ICUPKG_BIN" out/Release/icupkg

            if [ ! -x out/Release/icupkg ]; then

                echo \"FATAL: failed to stage out/Release/icupkg for node build\" >&2

                exit 1
@@ -623,16 +624,17 @@ update_libraries() { 
        ensure_icupkg() {

            local c

            for c in \

                /usr/local/bin/icupkg \

                \$PREFIX/icu-host/bin/icupkg \

                \$PREFIX/icu-host/sbin/icupkg \

                /build/libs/icu/icu4c/source/build-host/bin/icupkg

                /build/libs/icu/icu4c/source/build-host/bin/icupkg \

                /usr/local/bin/icupkg

            do

                if [ -x "\$c" ]; then

                    ln -sf "\$c" /usr/local/bin/icupkg

                    ICUPKG_BIN="\$c"

                    return 0

                fi

            done

            ICUPKG_BIN=

            return 1

        }
@@ -716,11 +718,11 @@ update_libraries() { 
            mkdir -p build-host && cd build-host

            ../configure --prefix=\$PREFIX/icu-host

            make -j\$(nproc)

            make install

            ICUPKG_BIN=

            for c in \

            if [ -z "\$ICUPKG_BIN" ] || [ ! -x "\$ICUPKG_BIN" ]; then

                echo "FATAL: detected icupkg path is invalid: \$ICUPKG_BIN" >&2

                \$PREFIX/icu-host/bin/icupkg \

                \$PREFIX/icu-host/sbin/icupkg \

            ln -sf "\$ICUPKG_BIN" /usr/local/bin/icupkg

                /build/libs/icu/icu4c/source/build-host/bin/icupkg

            do

                if [ -x "\$c" ]; then
@@ -730,7 +732,7 @@ update_libraries() { 
            done

            if [ -z "\$ICUPKG_BIN" ]; then

                echo \"FATAL: icupkg was not built by ICU\" >&2

                exit 1

            install -m 0755 "\$ICUPKG_BIN" out/Release/icupkg

            fi

            ln -sf "\$ICUPKG_BIN" /usr/local/bin/icupkg

            touch /build/libs/.icu-tools.done