Skip to content
Snippets Groups Projects
Commit 274c5483 authored by Natanael Copa's avatar Natanael Copa
Browse files

main/cmake: fix circular dependency

commit 116eb260 (main/brotli: upgrade to 1.1.0) introduced a
circular dependency:

  brotli -> cmake -> curl -> brotli

Solve this by use the embedded curl in cmake.
parent dcb2521e
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cmake pkgname=cmake
pkgver=3.27.7 pkgver=3.27.7
pkgrel=1 pkgrel=2
pkgdesc="Cross-platform, open-source make system" pkgdesc="Cross-platform, open-source make system"
url="https://www.cmake.org/" url="https://www.cmake.org/"
arch="all" arch="all"
...@@ -39,9 +39,9 @@ source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz ...@@ -39,9 +39,9 @@ source="https://www.cmake.org/files/$_v/cmake-$pkgver.tar.gz
options="!check" options="!check"
build() { build() {
# jsoncpp/cppdap needs cmake to build so to avoid recursive build # jsoncpp/cppdap/curl needs cmake to build so to avoid recursive build
# dependency, we use the bundled version. # dependency, we use the bundled version.
# Do NOT remove --no-system-jsoncpp or --no-system-cppdap # Do NOT remove --no-system-jsoncpp, --no-system-cppdap or --no-system-curl
./bootstrap \ ./bootstrap \
--prefix=/usr \ --prefix=/usr \
...@@ -50,9 +50,9 @@ build() { ...@@ -50,9 +50,9 @@ build() {
--docdir=/share/doc/$pkgname \ --docdir=/share/doc/$pkgname \
--sphinx-man \ --sphinx-man \
--no-system-cppdap \ --no-system-cppdap \
--no-system-curl \
--no-system-jsoncpp \ --no-system-jsoncpp \
--system-bzip2 \ --system-bzip2 \
--system-curl \
--system-expat \ --system-expat \
--system-libarchive \ --system-libarchive \
--system-liblzma \ --system-liblzma \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment