From 8e5109e42e4d2311db8d2cdfd784a043fec8c32a Mon Sep 17 00:00:00 2001 From: Ivan Max Date: Wed, 6 Sep 2023 20:05:06 +0000 Subject: [PATCH] rebuild some packages in gpkg (#89) --- gpkg/attr/build.sh | 3 ++- gpkg/expat/build.sh | 2 +- gpkg/libidn2/build.sh | 7 ++----- gpkg/liblz4/build.sh | 1 + gpkg/liblz4/lz4.subpackage.sh | 1 + gpkg/liblzma/xz-utils.subpackage.sh | 1 + gpkg/libssh2/build.sh | 5 +---- gpkg/openssl/build.sh | 5 +++-- gpkg/zstd/build.sh | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gpkg/attr/build.sh b/gpkg/attr/build.sh index f52f54b2b..def8b6771 100644 --- a/gpkg/attr/build.sh +++ b/gpkg/attr/build.sh @@ -3,9 +3,10 @@ TERMUX_PKG_DESCRIPTION="Utilities for manipulating filesystem extended attribute TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=2.5.1 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/attr/attr-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=bae1c6949b258a0d68001367ce0c741cebdacdd3b62965d17e5eb23cd78adaf8 -TERMUX_PKG_DEPENDS="glibc" +TERMUX_PKG_DEPENDS="glibc, gcc-glibc-libs-dev" TERMUX_PKG_BUILD_IN_SRC=true # At the moment we don't have gettext-glibc TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gettext=no" diff --git a/gpkg/expat/build.sh b/gpkg/expat/build.sh index 467377261..b395b59b4 100644 --- a/gpkg/expat/build.sh +++ b/gpkg/expat/build.sh @@ -5,5 +5,5 @@ TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=2.5.0 TERMUX_PKG_SRCURL=https://github.com/libexpat/libexpat/releases/download/R_${TERMUX_PKG_VERSION//./_}/expat-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_SHA256=6f0e6e01f7b30025fa05c85fdad1e5d0ec7fd35d9f61b22f34998de11969ff67 -TERMUX_PKG_DEPENDS="glibc" +TERMUX_PKG_DEPENDS="glibc, gcc-glibc-libs-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-docbook" diff --git a/gpkg/libidn2/build.sh b/gpkg/libidn2/build.sh index 813101dc7..66e2b73ce 100644 --- a/gpkg/libidn2/build.sh +++ b/gpkg/libidn2/build.sh @@ -3,10 +3,7 @@ TERMUX_PKG_DESCRIPTION="Free software implementation of IDNA2008, Punycode and T TERMUX_PKG_LICENSE="LGPL-3.0, GPL-2.0, GPL-3.0" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=2.3.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/libidn/libidn2-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f -TERMUX_PKG_DEPENDS="libunistring-glibc" - -termux_step_pre_configure() { - LDFLAGS+=" -lunistring" -} +TERMUX_PKG_DEPENDS="libunistring-glibc, gcc-glibc-libs-dev" diff --git a/gpkg/liblz4/build.sh b/gpkg/liblz4/build.sh index 4f016c39d..743302c75 100644 --- a/gpkg/liblz4/build.sh +++ b/gpkg/liblz4/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Fast LZ compression algorithm library" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=1.9.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/lz4/lz4/archive/v${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b TERMUX_PKG_DEPENDS="glibc" diff --git a/gpkg/liblz4/lz4.subpackage.sh b/gpkg/liblz4/lz4.subpackage.sh index 078e5b999..2dc975fff 100644 --- a/gpkg/liblz4/lz4.subpackage.sh +++ b/gpkg/liblz4/lz4.subpackage.sh @@ -1,2 +1,3 @@ TERMUX_SUBPKG_INCLUDE="glibc/bin/ glibc/share/man/man1/" TERMUX_SUBPKG_DESCRIPTION="Fast LZ compression algorithm tool" +TERMUX_SUBPKG_DEPENDS="gcc-glibc-libs-dev" diff --git a/gpkg/liblzma/xz-utils.subpackage.sh b/gpkg/liblzma/xz-utils.subpackage.sh index 663b68435..903f9c1db 100644 --- a/gpkg/liblzma/xz-utils.subpackage.sh +++ b/gpkg/liblzma/xz-utils.subpackage.sh @@ -1,3 +1,4 @@ TERMUX_SUBPKG_INCLUDE="glibc/bin/ glibc/share/man/man1/" TERMUX_SUBPKG_DESCRIPTION="XZ-format compression tools" TERMUX_SUBPKG_ESSENTIAL=true +TERMUX_SUBPKG_DEPENDS="gcc-glibc-libs-dev" diff --git a/gpkg/libssh2/build.sh b/gpkg/libssh2/build.sh index 749fffc90..b0457fa44 100644 --- a/gpkg/libssh2/build.sh +++ b/gpkg/libssh2/build.sh @@ -3,10 +3,7 @@ TERMUX_PKG_DESCRIPTION="Client-side library implementing the SSH2 protocol" TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=1.11.0 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.libssh2.org/download/libssh2-$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461 TERMUX_PKG_DEPENDS="openssl-glibc, zlib-glibc" - -termux_step_pre_configure() { - LDFLAGS+=" -lz" -} diff --git a/gpkg/openssl/build.sh b/gpkg/openssl/build.sh index 0499fbf02..b3337873c 100644 --- a/gpkg/openssl/build.sh +++ b/gpkg/openssl/build.sh @@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well a TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION=3.1.2 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SHA256=a0ce69b8b97ea6a35b96875235aa453b966ba3cba8af2de23657d8b6767d6539 -TERMUX_PKG_DEPENDS="ca-certificates, zlib-glibc" -TERMUX_PKG_CONFFILES="glibc/etc/tls/openssl.cnf" +TERMUX_PKG_DEPENDS="ca-certificates, zlib-glibc, gcc-glibc-libs-dev" +TERMUX_PKG_CONFFILES="glibc/etc/ssl/openssl.cnf" TERMUX_PKG_BUILD_IN_SRC=true termux_step_configure() { diff --git a/gpkg/zstd/build.sh b/gpkg/zstd/build.sh index faaa9b9d8..50bde0650 100644 --- a/gpkg/zstd/build.sh +++ b/gpkg/zstd/build.sh @@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux-pacman" TERMUX_PKG_VERSION="1.5.5" TERMUX_PKG_SRCURL=https://github.com/facebook/zstd/archive/v$TERMUX_PKG_VERSION.tar.gz TERMUX_PKG_SHA256=98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1 -TERMUX_PKG_DEPENDS="liblzma-glibc, zlib-glibc, liblz4-glibc" +TERMUX_PKG_DEPENDS="liblzma-glibc, zlib-glibc, liblz4-glibc, gcc-glibc-libs-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Ddefault_library=both -Dbin_programs=true