diff --git a/deps/24.04/libdeflate-dev_1.19-1build1.1_amd64.deb b/deps/24.04/libdeflate-dev_1.19-1build1.1_amd64.deb new file mode 100644 index 0000000..5fe210b Binary files /dev/null and b/deps/24.04/libdeflate-dev_1.19-1build1.1_amd64.deb differ diff --git a/deps/24.04/libdeflate-dev_1.19-1build1_amd64.deb b/deps/24.04/libdeflate-dev_1.19-1build1_amd64.deb deleted file mode 100644 index edd6513..0000000 Binary files a/deps/24.04/libdeflate-dev_1.19-1build1_amd64.deb and /dev/null differ diff --git a/deps/24.04/liblzma-dev_5.6.1+really5.4.5-1_amd64.deb b/deps/24.04/liblzma-dev_5.6.1+really5.4.5-1_amd64.deb deleted file mode 100644 index 341765a..0000000 Binary files a/deps/24.04/liblzma-dev_5.6.1+really5.4.5-1_amd64.deb and /dev/null differ diff --git a/deps/24.04/liblzma-dev_5.6.1+really5.4.5-1build0.1_amd64.deb b/deps/24.04/liblzma-dev_5.6.1+really5.4.5-1build0.1_amd64.deb new file mode 100644 index 0000000..b920e11 Binary files /dev/null and b/deps/24.04/liblzma-dev_5.6.1+really5.4.5-1build0.1_amd64.deb differ diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh index 8cb0611..169327d 100644 --- a/scripts/build-deps.sh +++ b/scripts/build-deps.sh @@ -2,8 +2,7 @@ install_pkg() { pkg_dir=$1 ( cd "$pkg_dir" || exit 1 - cp /usr/share/automake-*/config.guess ./config.guess - cp /usr/share/automake-*/config.sub ./config.sub + fix_config_files sudo ./configure --prefix=/usr sudo make -j"$(nproc)" sudo make install DESTDIR="$DESTDIR" @@ -27,6 +26,7 @@ add_openssl() { tar -xzf /tmp/openssl.tar.gz -C /tmp ( cd /tmp/openssl-1.0.2u || exit 1 + fix_config_files ./config --prefix=/usr --openssldir=/etc/ssl --libdir=lib/openssl-1.0 shared zlib-dynamic make depend sudo make -j"$(nproc)" @@ -34,6 +34,12 @@ add_openssl() { ) } +fix_config_files() { + for conf_file in config.guess config.sub; do + find . -name "$conf_file" -exec cp /usr/share/automake-*/"$conf_file" {} \; + done +} + mode="${1:-all}" DESTDIR="${2:-}" diff --git a/scripts/build-extensions.sh b/scripts/build-extensions.sh index 7865d4f..68e5c88 100644 --- a/scripts/build-extensions.sh +++ b/scripts/build-extensions.sh @@ -8,6 +8,7 @@ build_extension() { ( cd "$source_dir" || exit phpize + fix_config_files sudo ./configure "${args[@]}" --with-php-config="$install_dir"/bin/php-config sudo make -j"$(nproc)" sudo make install @@ -26,6 +27,7 @@ build_lib() { mkdir "$install_dir"/lib/"$lib" ( cd "$source_dir" || exit + fix_config_files sudo ./configure --prefix="$install_dir"/lib/"$lib" "$@" sudo make -j"$(nproc)" sudo make install @@ -140,6 +142,12 @@ add_redis() { build_extension redis /tmp/redis-"$REDIS_VERSION" extension 20 --enable-redis --enable-redis-igbinary } +fix_config_files() { + for conf_file in config.guess config.sub; do + find . -name "$conf_file" -exec cp /usr/share/automake-*/"$conf_file" {} \; + done +} + PHP_VERSION=${PHP_VERSION:-'5.3'} APCU_VERSION='4.0.11' AMQP_VERSION='1.9.3'