diff --git a/temp/abuild/APKBUILD b/temp/abuild/APKBUILD index 3686af006..e0e44b170 100644 --- a/temp/abuild/APKBUILD +++ b/temp/abuild/APKBUILD @@ -2,8 +2,8 @@ pkgname=abuild pkgver=99993.15.0 _pkgver=3.15.0 -_commit="709363ea16f7febb08300511a9ca2aa8ca9b30c1" -pkgrel=1 +_commit="0d6da731d6a09221fd2dabc2b93cd44c53846d46" +pkgrel=2 pkgdesc="Script to build Alpine Packages" url="https://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -38,7 +38,6 @@ 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" @@ -123,7 +122,6 @@ _sudo() { } sha512sums=" -e8f7b846f7f56b5add0a1d963988f2c73b199675b58328ff4f01bd49d4447d224c5e19cbc24bbbacffd912ed83fc7c4fa6b6518b3376e78452cfa7b2b460d995 abuild-709363ea16f7febb08300511a9ca2aa8ca9b30c1.tar.gz +cc2852f56885f622b3efb725b62fec77e2cb60f05107fe7ab4756238ebcd16abc2ee6608081d410fb9fb017850b58d5b17cec3058faa8de9ca4e56db5e7ce0e9 abuild-0d6da731d6a09221fd2dabc2b93cd44c53846d46.tar.gz fbb44d871d57f31f1e94f0b7a1daed8bd86e2312c6c7a68dd599e71836b7fbc6e1159e865ce464c58f7fa2292adba3ab73ad90bd5b1a274f0ba8886108842f8a cargo-target.patch -c88527a3ad9920254cf218c28558a10564288a8cd348ef3d115c75d9a57bfd41d7a5b8979950bcff8b46efaa046f1d900c83db0bb61731804892a9413f66b090 cmake-generator.patch " diff --git a/temp/abuild/cmake-generator.patch b/temp/abuild/cmake-generator.patch deleted file mode 100644 index 793a482e3..000000000 --- a/temp/abuild/cmake-generator.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 \\