Skip to content

Commit

Permalink
delete libunistring and libiconv [ci skip]
Browse files Browse the repository at this point in the history
No longer necessary with libpsl 0.21.5.
  • Loading branch information
vszakats committed Jan 14, 2024
1 parent 3a0fd34 commit 592e646
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 173 deletions.
4 changes: 0 additions & 4 deletions _build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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_}"
Expand Down
22 changes: 1 addition & 21 deletions _dl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,6 @@ cat <<EOF
"sig": ".sig",
"keys": "A3CC9C870B9D310ABAD4CF2F51722B08FE4745A2"
},
{
"name": "libunistring",
"url": "https://ftp.gnu.org/gnu/libunistring/libunistring-{ver}.tar.xz",
"sig": ".sig",
"keys": "9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D"
},
{
"name": "libiconv",
"url": "https://ftp.gnu.org/pub/gnu/libiconv/libiconv-{ver}.tar.gz",
"sig": ".sig",
"keys": "9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D"
},
{
"name": "libpsl",
"url": "https://github.com/rockdaboot/libpsl/releases/download/{ver}/libpsl-{ver}.tar.gz",
Expand Down Expand Up @@ -703,7 +691,7 @@ fi
need_cacert=0

if [[ "${_CONFIG}" = *'big'* ]]; then
_DEPS+=' libidn2 libunistring libiconv libpsl gsasl'
_DEPS+=' libidn2 libpsl gsasl'
fi
if [[ "${_CONFIG}" = *'wolfssl'* ]]; then
_DEPS+=' wolfssl'
Expand Down Expand Up @@ -789,14 +777,6 @@ if [[ "${_DEPS}" = *'libidn2'* ]]; then
live_dl libidn2 "${LIBIDN2_VER_}"
live_xt libidn2 "${LIBIDN2_HASH}"
fi
if [[ "${_DEPS}" = *'libunistring'* ]]; then
live_dl libunistring "${LIBUNISTRING_VER_}"
live_xt libunistring "${LIBUNISTRING_HASH}"
fi
if [[ "${_DEPS}" = *'libiconv'* ]]; then
live_dl libiconv "${LIBICONV_VER_}"
live_xt libiconv "${LIBICONV_HASH}"
fi
if [[ "${_DEPS}" = *'libpsl'* ]]; then
live_dl libpsl "${LIBPSL_VER_}"
live_xt libpsl "${LIBPSL_HASH}"
Expand Down
4 changes: 0 additions & 4 deletions _versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ export GSASL_VER_='2.2.1'
export GSASL_HASH=d45b562e13bd13b9fc20b372f4b53269740cf6279f836f09ce11b9d32bcee075
export LIBIDN2_VER_='2.3.4'
export LIBIDN2_HASH=93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f
export LIBUNISTRING_VER_='1.1'
export LIBUNISTRING_HASH=827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98
export LIBICONV_VER_='1.17'
export LIBICONV_HASH=8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313
export LIBPSL_VER_='0.21.5'
export LIBPSL_HASH=1dcc9ceae8b128f3c0b3f654decd0e1e891afc6ff81098f227ef260449dae208
export WOLFSSH_VER_='1.4.15'
Expand Down
68 changes: 0 additions & 68 deletions libiconv.sh

This file was deleted.

7 changes: 0 additions & 7 deletions libidn2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
69 changes: 0 additions & 69 deletions libunistring.sh

This file was deleted.

0 comments on commit 592e646

Please sign in to comment.