libgit2: Simplify dependency logic
This commit is contained in:
@@ -16,11 +16,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-http-parser"
|
||||
"${MINGW_PACKAGE_PREFIX}-libiconv"
|
||||
"${MINGW_PACKAGE_PREFIX}-pcre2"
|
||||
"${MINGW_PACKAGE_PREFIX}-zlib")
|
||||
_openssl_depends=("${MINGW_PACKAGE_PREFIX}-openssl")
|
||||
makedepends=(
|
||||
"${MINGW_PACKAGE_PREFIX}-cc"
|
||||
"${MINGW_PACKAGE_PREFIX}-cmake"
|
||||
"${MINGW_PACKAGE_PREFIX}-ninja"
|
||||
"${MINGW_PACKAGE_PREFIX}-openssl"
|
||||
"${MINGW_PACKAGE_PREFIX}-python"
|
||||
)
|
||||
source=(${_realname}-${pkgver}.tar.gz::"https://github.com/libgit2/libgit2/archive/v${pkgver}.tar.gz"
|
||||
@@ -97,8 +97,7 @@ check() {
|
||||
|
||||
package_libgit2() {
|
||||
cd "${srcdir}"/build-${MSYSTEM}-openssl
|
||||
depends=("${depends[@]}"
|
||||
"${_openssl_depends[@]}")
|
||||
depends+=("${MINGW_PACKAGE_PREFIX}-openssl")
|
||||
|
||||
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
|
||||
|
||||
@@ -110,7 +109,6 @@ package_libgit2() {
|
||||
|
||||
package_libgit2-winhttp() {
|
||||
cd "${srcdir}"/build-${MSYSTEM}-winhttp
|
||||
depends=("${depends[@]}")
|
||||
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
|
||||
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user