From c26710efcb7c5226a5bca28bd7999b46c7efa910 Mon Sep 17 00:00:00 2001 From: fossdd Date: Tue, 17 Jun 2025 11:54:18 +0200 Subject: [PATCH] temp/abuild: set ninja as default cmake generator https://gitlab.alpinelinux.org/alpine/aports/-/commit/cce7a609c1d0134be0a1988732cfd44a36f833fe Part-of: https://gitlab.postmarketos.org/postmarketos/pmaports/-/merge_requests/6676 --- temp/abuild/APKBUILD | 4 +++- temp/abuild/cmake-generator.patch | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 temp/abuild/cmake-generator.patch diff --git a/temp/abuild/APKBUILD b/temp/abuild/APKBUILD index 367ff9a6c..3686af006 100644 --- a/temp/abuild/APKBUILD +++ b/temp/abuild/APKBUILD @@ -3,7 +3,7 @@ pkgname=abuild pkgver=99993.15.0 _pkgver=3.15.0 _commit="709363ea16f7febb08300511a9ca2aa8ca9b30c1" -pkgrel=0 +pkgrel=1 pkgdesc="Script to build Alpine Packages" url="https://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -38,6 +38,7 @@ pkggroups="abuild" source=" https://gitlab.alpinelinux.org/postmarketOS/abuild/-/archive/$_commit/abuild-$_commit.tar.gz cargo-target.patch + cmake-generator.patch " builddir="$srcdir/$pkgname-$_commit" @@ -124,4 +125,5 @@ _sudo() { sha512sums=" e8f7b846f7f56b5add0a1d963988f2c73b199675b58328ff4f01bd49d4447d224c5e19cbc24bbbacffd912ed83fc7c4fa6b6518b3376e78452cfa7b2b460d995 abuild-709363ea16f7febb08300511a9ca2aa8ca9b30c1.tar.gz fbb44d871d57f31f1e94f0b7a1daed8bd86e2312c6c7a68dd599e71836b7fbc6e1159e865ce464c58f7fa2292adba3ab73ad90bd5b1a274f0ba8886108842f8a cargo-target.patch +c88527a3ad9920254cf218c28558a10564288a8cd348ef3d115c75d9a57bfd41d7a5b8979950bcff8b46efaa046f1d900c83db0bb61731804892a9413f66b090 cmake-generator.patch " diff --git a/temp/abuild/cmake-generator.patch b/temp/abuild/cmake-generator.patch new file mode 100644 index 000000000..793a482e3 --- /dev/null +++ b/temp/abuild/cmake-generator.patch @@ -0,0 +1,24 @@ +Ref https://gitlab.alpinelinux.org/alpine/abuild/-/merge_requests/386 + +--- a/default.conf ++++ b/default.conf +@@ -13,6 +13,8 @@ export CARGO_BUILD_JOBS=$JOBS + export CMAKE_BUILD_PARALLEL_LEVEL=$JOBS + export CTEST_PARALLEL_LEVEL=$JOBS + ++export CMAKE_GENERATOR=Ninja ++ + export CARGO_PROFILE_RELEASE_OPT_LEVEL="s" + export CARGO_PROFILE_RELEASE_PANIC="abort" + export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1 +--- a/newapkbuild.in ++++ b/newapkbuild.in +@@ -67,7 +67,7 @@ build_cmake() { + if [ "\$CBUILD" != "\$CHOST" ]; then + local crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi +- cmake -B build -G Ninja \\ ++ cmake -B build \\ + -DCMAKE_INSTALL_PREFIX=/usr \\ + -DCMAKE_INSTALL_LIBDIR=lib \\ + -DBUILD_SHARED_LIBS=ON \\