diff --git a/_build.sh b/_build.sh index 5112ac182..4cac5c435 100755 --- a/_build.sh +++ b/_build.sh @@ -169,8 +169,6 @@ set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o p # zstd cmake # brotli cmake # cares cmake -# libunistring autotools -# libiconv autotools # libidn2 autotools # libpsl autotools # gsasl autotools @@ -1620,8 +1618,6 @@ build_single_target() { bld zstd "${ZSTD_VER_}" bld brotli "${BROTLI_VER_}" bld cares "${CARES_VER_}" - bld libunistring "${LIBUNISTRING_VER_}" - bld libiconv "${LIBICONV_VER_}" bld libidn2 "${LIBIDN2_VER_}" bld libpsl "${LIBPSL_VER_}" bld nghttp3 "${NGHTTP3_VER_}" diff --git a/_dl.sh b/_dl.sh index 086594e4a..1b9db8e9e 100755 --- a/_dl.sh +++ b/_dl.sh @@ -66,18 +66,6 @@ cat </dev/null # V=1 - - # Delete .pc and .la files - rm -r -f "${_PP}"/lib/pkgconfig - rm -f "${_PP}"/lib/*.la - - # Make steps for determinism - - readonly _ref='NEWS' - - # shellcheck disable=SC2086 - "${_STRIP_LIB}" ${_STRIPFLAGS_LIB} "${_PP}"/lib/*.a - - touch -c -r "${_ref}" "${_PP}"/include/*.h - touch -c -r "${_ref}" "${_PP}"/lib/*.a - - # Create package - - _OUT="${_NAM}-${_VER}${_REVSUFFIX}${_PKGSUFFIX}" - _BAS="${_NAM}-${_VER}${_PKGSUFFIX}" - _DST="$(pwd)/_pkg"; rm -r -f "${_DST}" - - mkdir -p "${_DST}/include" - mkdir -p "${_DST}/lib" - - cp -f -p "${_PP}"/include/*.h "${_DST}/include/" - cp -f -p "${_PP}"/lib/*.a "${_DST}/lib/" - cp -f -p NEWS "${_DST}/NEWS.txt" - cp -f -p AUTHORS "${_DST}/AUTHORS.txt" - cp -f -p COPYING "${_DST}/COPYING.txt" - cp -f -p README "${_DST}/README.txt" - - ../_pkg.sh "$(pwd)/${_ref}" -) diff --git a/libidn2.sh b/libidn2.sh index a79bdede8..0c89e815f 100755 --- a/libidn2.sh +++ b/libidn2.sh @@ -26,13 +26,6 @@ _VER="$1" export LDFLAGS="${_LDFLAGS_GLOBAL} ${_LDFLAGS_GLOBAL_AUTOTOOLS}" export LIBS='' - if [[ "${_DEPS}" = *'libiconv'* ]] && [ -d "../libiconv/${_PP}" ]; then - options+=" --with-libiconv-prefix=${_TOP}/libiconv/${_PP}" - fi - if [[ "${_DEPS}" = *'libunistring'* ]] && [ -d "../libunistring/${_PP}" ]; then - options+=" --with-libunistring-prefix=${_TOP}/libunistring/${_PP}" - fi - ( mkdir "${_BLDDIR}"; cd "${_BLDDIR}" # shellcheck disable=SC2086 diff --git a/libunistring.sh b/libunistring.sh deleted file mode 100755 index 25dd9c45a..000000000 --- a/libunistring.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (C) Viktor Szakats. See LICENSE.md -# SPDX-License-Identifier: MIT - -# shellcheck disable=SC3040,SC2039 -set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o pipefail - -export _NAM _VER _OUT _BAS _DST - -_NAM="$(basename "$0" | cut -f 1 -d '.')" -_VER="$1" - -( - cd "${_NAM}" || exit 0 - - rm -r -f "${_PKGDIR:?}" "${_BLDDIR:?}" - - options="${_CONFIGURE_GLOBAL}" - export CC="${_CC_GLOBAL}" - export CFLAGS="${_CFLAGS_GLOBAL} ${_CFLAGS_GLOBAL_AUTOTOOLS}" - export CPPFLAGS="${_CPPFLAGS_GLOBAL}" - export LDFLAGS="${_LDFLAGS_GLOBAL} ${_LDFLAGS_GLOBAL_AUTOTOOLS}" - export LIBS='' - - ( - mkdir "${_BLDDIR}"; cd "${_BLDDIR}" - # shellcheck disable=SC2086 - ../configure ${options} \ - --disable-rpath \ - --enable-static \ - --disable-shared \ - --enable-threads=windows --silent - ) - - make --directory="${_BLDDIR}" --jobs="${_JOBS}" install "DESTDIR=$(pwd)/${_PKGDIR}" # >/dev/null # V=1 - - # Delete .pc and .la files - rm -r -f "${_PP}"/lib/pkgconfig - rm -f "${_PP}"/lib/*.la - - # Make steps for determinism - - readonly _ref='NEWS' - - # shellcheck disable=SC2086 - "${_STRIP_LIB}" ${_STRIPFLAGS_LIB} "${_PP}"/lib/*.a - - touch -c -r "${_ref}" "${_PP}"/include/*.h - touch -c -r "${_ref}" "${_PP}"/lib/*.a - - # Create package - - _OUT="${_NAM}-${_VER}${_REVSUFFIX}${_PKGSUFFIX}" - _BAS="${_NAM}-${_VER}${_PKGSUFFIX}" - _DST="$(pwd)/_pkg"; rm -r -f "${_DST}" - - mkdir -p "${_DST}/include" - mkdir -p "${_DST}/lib" - - cp -f -p "${_PP}"/include/*.h "${_DST}/include/" - cp -f -p "${_PP}"/lib/*.a "${_DST}/lib/" - cp -f -p NEWS "${_DST}/NEWS.txt" - cp -f -p AUTHORS "${_DST}/AUTHORS.txt" - cp -f -p COPYING "${_DST}/COPYING.txt" - cp -f -p README "${_DST}/README.txt" - - ../_pkg.sh "$(pwd)/${_ref}" -)