libcurl: unsplit 'curl' subpackage
Both packages are essential and expect to be in bootstrap installation so splitting is quite useless here.
This commit is contained in:
parent
e906c0e652
commit
f9b5f96b5a
@ -4,9 +4,10 @@ TERMUX_PKG_HOMEPAGE=https://github.com/alpinelinux/abuild
|
||||
TERMUX_PKG_DESCRIPTION="Build script to build Alpine packages"
|
||||
TERMUX_PKG_LICENSE="GPL-2.0"
|
||||
TERMUX_PKG_VERSION=3.4.0
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_SRCURL=https://github.com/alpinelinux/abuild/archive/v$TERMUX_PKG_VERSION.tar.gz
|
||||
TERMUX_PKG_SHA256=f6f704e34f9d388a0228b645050dc7db7bf92f15a088835ae2c9b244420b9b61
|
||||
TERMUX_PKG_DEPENDS="apk-tools, autoconf, automake, bash, clang, curl, libtool, make, openssl-tool, pkg-config, tar, zlib"
|
||||
TERMUX_PKG_DEPENDS="apk-tools, autoconf, automake, bash, clang, libcurl, libtool, make, openssl-tool, pkg-config, tar, zlib"
|
||||
TERMUX_PKG_BUILD_IN_SRC=yes
|
||||
TERMUX_PKG_EXTRA_MAKE_ARGS="sysconfdir=$TERMUX_PREFIX/etc"
|
||||
TERMUX_PKG_CONFFILES="etc/abuild.conf"
|
||||
|
@ -2,14 +2,20 @@ TERMUX_PKG_HOMEPAGE=https://curl.haxx.se/
|
||||
TERMUX_PKG_DESCRIPTION="Easy-to-use client-side URL transfer library"
|
||||
TERMUX_PKG_LICENSE="MIT"
|
||||
TERMUX_PKG_VERSION=7.65.3
|
||||
TERMUX_PKG_REVISION=3
|
||||
TERMUX_PKG_REVISION=4
|
||||
TERMUX_PKG_SRCURL=https://curl.haxx.se/download/curl-${TERMUX_PKG_VERSION}.tar.bz2
|
||||
TERMUX_PKG_SHA256=0a855e83be482d7bc9ea00e05bdb1551a44966076762f9650959179c89fce509
|
||||
TERMUX_PKG_DEPENDS="libnghttp2, openssl (>= 1.1.1), zlib"
|
||||
TERMUX_PKG_BREAKS="libcurl-dev"
|
||||
TERMUX_PKG_REPLACES="libcurl-dev"
|
||||
TERMUX_PKG_BREAKS="curl, libcurl-dev"
|
||||
TERMUX_PKG_REPLACES="curl, libcurl-dev"
|
||||
TERMUX_PKG_PROVIDES="curl"
|
||||
TERMUX_PKG_ESSENTIAL=yes
|
||||
|
||||
# Starting with version 7.62 curl started enabling http/2 by default.
|
||||
# Support for http/2 as added in version 1.4.8-8 of the apt package, so we
|
||||
# conflict with previous versions to avoid broken installations.
|
||||
TERMUX_PKG_CONFLICTS="apt (<< 1.4.8-8)"
|
||||
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
--enable-ntlm-wb=$TERMUX_PREFIX/bin/ntlm_auth
|
||||
--with-ca-bundle=$TERMUX_PREFIX/etc/tls/cert.pem
|
||||
@ -20,9 +26,3 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
--without-brotli
|
||||
--with-ssl
|
||||
"
|
||||
|
||||
|
||||
# Starting with version 7.62 curl started enabling http/2 by default.
|
||||
# Support for http/2 as added in version 1.4.8-8 of the apt package, so we
|
||||
# conflict with previous versions to avoid broken installations.
|
||||
TERMUX_PKG_CONFLICTS="apt (<< 1.4.8-8)"
|
||||
|
@ -1,3 +0,0 @@
|
||||
TERMUX_SUBPKG_INCLUDE="bin/curl share/man/man1/curl.1.gz"
|
||||
TERMUX_SUBPKG_DESCRIPTION="Command line tool for transferring data with URL syntax"
|
||||
TERMUX_SUBPKG_ESSENTIAL=yes
|
@ -2,10 +2,10 @@ TERMUX_PKG_HOMEPAGE=https://luarocks.org/
|
||||
TERMUX_PKG_DESCRIPTION="Deployment and management system for Lua modules"
|
||||
TERMUX_PKG_LICENSE="BSD"
|
||||
TERMUX_PKG_VERSION=3.1.3
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_REVISION=2
|
||||
TERMUX_PKG_SRCURL=https://luarocks.org/releases/luarocks-${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=c573435f495aac159e34eaa0a3847172a2298eb6295fcdc35d565f9f9b990513
|
||||
TERMUX_PKG_DEPENDS="curl, lua"
|
||||
TERMUX_PKG_DEPENDS="libcurl, lua"
|
||||
TERMUX_PKG_BUILD_DEPENDS="liblua"
|
||||
TERMUX_PKG_BUILD_IN_SRC=yes
|
||||
TERMUX_PKG_PLATFORM_INDEPENDENT=yes
|
||||
|
@ -2,6 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://termux.com/
|
||||
TERMUX_PKG_DESCRIPTION="Basic system tools for Termux"
|
||||
TERMUX_PKG_LICENSE="GPL-3.0"
|
||||
TERMUX_PKG_VERSION=0.69
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_PLATFORM_INDEPENDENT=yes
|
||||
TERMUX_PKG_ESSENTIAL=yes
|
||||
TERMUX_PKG_CONFFILES="etc/motd"
|
||||
@ -10,7 +11,7 @@ TERMUX_PKG_CONFLICTS="procps (<< 3.3.15-2)"
|
||||
# Some of these packages are not dependencies and used only to ensure
|
||||
# that core packages are installed after upgrading (we removed busybox
|
||||
# from essentials).
|
||||
TERMUX_PKG_DEPENDS="bzip2, coreutils, curl, dash, diffutils, findutils, gawk, grep, gzip, less, procps, psmisc, sed, tar, termux-am, termux-exec, xz-utils"
|
||||
TERMUX_PKG_DEPENDS="bzip2, coreutils, dash, diffutils, findutils, gawk, grep, gzip, less, procps, psmisc, sed, tar, termux-am, termux-exec, xz-utils"
|
||||
|
||||
# Optional packages that are distributed as part of bootstrap archives.
|
||||
TERMUX_PKG_RECOMMENDS="ed, dos2unix, inetutils, net-tools, patch, unzip, util-linux"
|
||||
|
Loading…
Reference in New Issue
Block a user