ArchPOWER/packages
1
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Packages Projects Releases 18 Wiki Activity

* update build2 to 0.17.0-1

Browse Source
This commit is contained in:
Alexander Baldeck 2024-08-15 15:26:40 +02:00
parent a2567dc58a
commit 06c60754dd
4 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build2/.SRCINFO
View File

@ -1,19 +1,15 @@
pkgbase = build2 pkgbase = build2
pkgdesc = build2 build system pkgdesc = build2 build system
pkgver = 0.16.0 pkgver = 0.17.0
pkgrel = 2 pkgrel = 1
url = https://build2.org/ url = https://build2.org/
arch = x86_64 arch = x86_64
license = MIT license = MIT
makedepends = chrpath makedepends = chrpath
depends = gcc-libs depends = gcc-libs
depends = glibc depends = glibc
depends = sqlite3 depends = sqlite
source = https://download.build2.org/0.16.0/build2-toolchain-0.16.0.tar.xz source = https://download.build2.org/0.17.0/build2-toolchain-0.17.0.tar.xz
source = https://github.com/build2/libpkg-config/commit/c8978943.patch sha256sums = 3722a89ea86df742539d0f91bb4429fd46bbf668553a350780a63411b648bf5d
source = https://github.com/build2/libpkg-config/commit/604eb708.patch
sha256sums = 23793f682a17b1d95c80bbd849244735ed59a3e27361529aa4865d2776ff8adc
sha256sums = 5b3fdcb4ec53c487aa005224ddbc6db02f078f01c1de530839cc8146026b6a7e
sha256sums = 29c2eeff019c6d8b0ffd1bfcf74a02aacf96a2d3dd6df24e2b0b2d0b76d93f00
pkgname = build2 pkgname = build2

5
build2/.nvchecker.toml Normal file
View File

@ -0,0 +1,5 @@
[build2]
source = 'github'
github = 'build2/build2-toolchain'
use_max_tag = true
prefix = 'v'

18
build2/PKGBUILD
View File

@ -5,8 +5,8 @@
# Contributor: Filipe Verri <filipeverri@gmail.com> # Contributor: Filipe Verri <filipeverri@gmail.com>
pkgname=build2 pkgname=build2
pkgver=0.16.0 pkgver=0.17.0
pkgrel=2 pkgrel=1
pkgdesc='build2 build system' pkgdesc='build2 build system'
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
url='https://build2.org/' url='https://build2.org/'
@ -17,19 +17,11 @@ depends=(gcc-libs
sqlite3) sqlite3)
options=(!ccache !distcc) options=(!ccache !distcc)
source=(https://download.build2.org/$pkgver/build2-toolchain-$pkgver.tar.xz source=(https://download.build2.org/$pkgver/build2-toolchain-$pkgver.tar.xz
https://github.com/build2/libpkg-config/commit/c8978943.patch
https://github.com/build2/libpkg-config/commit/604eb708.patch
atomic-non-lock-free.patch) atomic-non-lock-free.patch)
sha256sums=('23793f682a17b1d95c80bbd849244735ed59a3e27361529aa4865d2776ff8adc' sha256sums=('3722a89ea86df742539d0f91bb4429fd46bbf668553a350780a63411b648bf5d'
'5b3fdcb4ec53c487aa005224ddbc6db02f078f01c1de530839cc8146026b6a7e' '30b993e1b1896a5eff54171128dbbbebd2de9d608a0b35d707b9259cf9f5588e')
'29c2eeff019c6d8b0ffd1bfcf74a02aacf96a2d3dd6df24e2b0b2d0b76d93f00'
'd02418f9212ca2909d250a9e14b88ce19911acfd4a0e312cbdb1141cb5222c29')
prepare() { prepare() {
# Fix build with glibc 2.38
patch -d build2-toolchain-$pkgver -p1 < c8978943.patch
patch -d build2-toolchain-$pkgver -p1 < 604eb708.patch
case "${CARCH}" in case "${CARCH}" in
powerpc) powerpc)
# Avoid: # Avoid:
@ -51,7 +43,7 @@ build() {
;; ;;
esac esac
./build.sh --trust yes --local --system libsqlite3,libpkgconfig --install-dir "$srcdir"/build/usr ${CXX:-g++} $CXXFLAGS $LDFLAGS ./build.sh --trust yes --local --system libsqlite3 --install-dir "$srcdir"/build/usr ${CXX:-g++} $CXXFLAGS $LDFLAGS
for f in "$srcdir"/build/usr/lib/pkgconfig/*.pc; do sed -i "s|$srcdir/build||" ${f}; done for f in "$srcdir"/build/usr/lib/pkgconfig/*.pc; do sed -i "s|$srcdir/build||" ${f}; done
} }

28
build2/atomic-non-lock-free.patch
View File

@ -1,5 +1,5 @@
--- build2-toolchain-0.16.0/build2/libbuild2/target.hxx.orig 2024-01-16 14:14:32.696119639 +0100 --- build2-toolchain-0.17.0/build2/libbuild2/target.hxx.orig 2024-01-16 14:14:32.696119639 +0100
+++ build2-toolchain-0.16.0/build2/libbuild2/target.hxx 2024-01-16 14:14:39.103465932 +0100 +++ build2-toolchain-0.17.0/build2/libbuild2/target.hxx 2024-01-16 14:14:39.103465932 +0100
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
#ifndef LIBBUILD2_TARGET_HXX #ifndef LIBBUILD2_TARGET_HXX
#define LIBBUILD2_TARGET_HXX #define LIBBUILD2_TARGET_HXX
@ -9,8 +9,8 @@
#include <cstddef> // max_align_t #include <cstddef> // max_align_t
#include <iterator> // tags, etc. #include <iterator> // tags, etc.
#include <type_traits> // is_* #include <type_traits> // is_*
--- build2-toolchain-0.16.0/build.sh.orig 2024-01-16 14:51:24.342555945 +0100 --- build2-toolchain-0.17.0/build.sh.orig 2024-01-16 14:51:24.342555945 +0100
+++ build2-toolchain-0.16.0/build.sh 2024-01-16 15:31:07.822696709 +0100 +++ build2-toolchain-0.17.0/build.sh 2024-01-16 15:31:07.822696709 +0100
@@ -308,8 +308,8 @@ @@ -308,8 +308,8 @@
# Compile and link options. # Compile and link options.
@ -34,14 +34,14 @@
fi fi
run build2/b-boot --version run build2/b-boot --version
--- build2-toolchain-0.16.0/libbutl/libbutl/buildfile.orig 2024-01-17 09:16:20.994868370 +0100 --- build2-toolchain-0.17.0/libbutl/libbutl/buildfile.orig 2024-08-15 14:55:05.608321330 +0200
+++ build2-toolchain-0.16.0/libbutl/libbutl/buildfile 2024-01-17 09:16:35.177406211 +0100 +++ build2-toolchain-0.17.0/libbutl/libbutl/buildfile 2024-08-15 14:55:58.363149859 +0200
@@ -76,7 +76,7 @@ @@ -52,7 +52,7 @@
} switch $tclass, $tsys
{
case 'linux'
- cxx.libs += -ldl
+ cxx.libs += -ldl -latomic
if! $windows case 'macos'
- cxx.libs += -lpthread cxx.libs += -framework CoreFoundation
+ cxx.libs += -lpthread -latomic
# Include the generated version header into the distribution (so that we don't
# pick up an installed one) and don't remove it when cleaning in src (so that