From cee23d83e09614c73cf35b83164e49603c2b546f Mon Sep 17 00:00:00 2001 From: Daniele Varrazzo Date: Sun, 5 Jan 2025 21:18:02 +0100 Subject: [PATCH] chore(macos): drop unneeded gettext from libpq building --- scripts/build/build_libpq.sh | 24 ------------------------ scripts/build/wheel_macos_before_all.sh | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/scripts/build/build_libpq.sh b/scripts/build/build_libpq.sh index a02cc90f..0baf37be 100755 --- a/scripts/build/build_libpq.sh +++ b/scripts/build/build_libpq.sh @@ -15,9 +15,6 @@ openssl_version="${OPENSSL_VERSION}" # last release: https://kerberos.org/dist/ krb5_version="1.21.3" -# last release: https://www.gnu.org/software/gettext/ -gettext_version="0.22.5" - # last release: https://openldap.org/software/download/ ldap_version="2.6.8" @@ -153,27 +150,6 @@ if [ "$ID" == "macos" ]; then fi -if [ "$ID" == "macos" ]; then - - # Build gettext if needed - gettext_dir="gettext-${gettext_version}" - if [ ! -d "${gettext_dir}" ]; then - curl -sL "https://ftp.gnu.org/pub/gnu/gettext/gettext-${gettext_version}.tar.gz" \ - | tar xzf - - - pushd "${gettext_dir}" - ./configure --disable-java "${make_configure_standard_flags[@]}" - make -C gettext-runtime all - else - pushd "${gettext_dir}" - fi - - make -C gettext-runtime install - popd - -fi - - if [ "$ID" == "centos" ] || [ "$ID" == "macos" ]; then # Build libsasl2 if needed diff --git a/scripts/build/wheel_macos_before_all.sh b/scripts/build/wheel_macos_before_all.sh index e5fdd141..36e1c0b8 100755 --- a/scripts/build/wheel_macos_before_all.sh +++ b/scripts/build/wheel_macos_before_all.sh @@ -15,7 +15,7 @@ prjdir="$( cd "${dir}/../.." && pwd )" "${prjdir}/scripts/build/build_libpq.sh" # Show dependency tree -# otool -L /tmp/libpq.build/lib/*.dylib +otool -L /tmp/libpq.build/lib/*.dylib brew install gnu-sed postgresql@${PG_VERSION} brew link --overwrite postgresql@${PG_VERSION}