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

test

parent 1f5dc18b

packaging/build-nspawn.sh

+18 −8
Original line number Diff line number Diff line
@@ -516,9 +516,9 @@ build_libraries() { 
                echo \"FATAL: icupkg is not available for node build\" >&2

                exit 1

            fi

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

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

                echo \"FATAL: resolved icupkg path is invalid: \$ICUPKG_REAL\" >&2

            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

                exit 1

            fi

            cd nodejs
@@ -530,7 +530,12 @@ build_libraries() { 
            export ICU_PKG=/usr/local/bin/icupkg

            ./configure --prefix=\$PREFIX --without-npm

            mkdir -p out/Release

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

            rm -f out/Release/icupkg

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

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

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

                exit 1

            fi

            make -j\$(nproc)

            make install

            ln -sf /usr/local/bin/node /usr/local/bin/nodejs
@@ -753,9 +758,9 @@ update_libraries() { 
                echo \"FATAL: icupkg is not available for node build\" >&2

                exit 1

            fi

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

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

                echo \"FATAL: resolved icupkg path is invalid: \$ICUPKG_REAL\" >&2

            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

                exit 1

            fi

            export CC=/usr/local/musl/bin/musl-clang
@@ -766,7 +771,12 @@ update_libraries() { 
            export ICU_PKG=/usr/local/bin/icupkg

            ./configure --prefix=\$PREFIX --without-npm

            mkdir -p out/Release

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

            rm -f out/Release/icupkg

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

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

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

                exit 1

            fi

            make -j\$(nproc)

            make install

            ln -sf /usr/local/bin/node /usr/local/bin/nodejs