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

test

parent 3ca0943e

packaging/build-nspawn.sh

+30 −8
Original line number Diff line number Diff line
@@ -468,11 +468,22 @@ build_libraries() { 
            ../configure --prefix=\$PREFIX/icu-host

            make -j\$(nproc)

            make install

            if [ ! -x \$PREFIX/icu-host/bin/icupkg ]; then

            ICUPKG_BIN=

            for c in \

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

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

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

            do

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

                    ICUPKG_BIN="\$c"

                    break

                fi

            done

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

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

                exit 1

            fi

            ln -sf \$PREFIX/icu-host/bin/icupkg /usr/local/bin/icupkg

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

            cd /build/libs

            touch .icu-tools.done

        else
@@ -490,8 +501,8 @@ build_libraries() { 
            export CXX=/usr/local/musl/bin/musl-clang++

            export AR=llvm-ar-${LLVM_VERSION}

            export RANLIB=llvm-ranlib-${LLVM_VERSION}

            export PATH=\$PREFIX/icu-host/bin:\$PATH

            export ICU_PKG=\$PREFIX/icu-host/bin/icupkg

            export PATH=\$PREFIX/icu-host/bin:\$PREFIX/icu-host/sbin:\$PATH

            export ICU_PKG=/usr/local/bin/icupkg

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

            make -j\$(nproc)

            make install
@@ -653,11 +664,22 @@ update_libraries() { 
            ../configure --prefix=\$PREFIX/icu-host

            make -j\$(nproc)

            make install

            if [ ! -x \$PREFIX/icu-host/bin/icupkg ]; then

            ICUPKG_BIN=

            for c in \

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

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

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

            do

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

                    ICUPKG_BIN="\$c"

                    break

                fi

            done

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

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

                exit 1

            fi

            ln -sf \$PREFIX/icu-host/bin/icupkg /usr/local/bin/icupkg

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

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

            cd /build/libs

        fi
@@ -688,8 +710,8 @@ update_libraries() { 
            export CXX=/usr/local/musl/bin/musl-clang++

            export AR=llvm-ar-${LLVM_VERSION}

            export RANLIB=llvm-ranlib-${LLVM_VERSION}

            export PATH=\$PREFIX/icu-host/bin:\$PATH

            export ICU_PKG=\$PREFIX/icu-host/bin/icupkg

            export PATH=\$PREFIX/icu-host/bin:\$PREFIX/icu-host/sbin:\$PATH

            export ICU_PKG=/usr/local/bin/icupkg

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

            make -j\$(nproc)

            make install