summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Revilla2021-10-20 23:28:22 +0200
committerMiguel Revilla2021-10-20 23:28:22 +0200
commitb6aee4bc327c63aa9df463f9ebc3fe9cd660ff26 (patch)
tree8fd6d99e4a73a9e18b531f51f021a2bf00b34057
parent6056bebdc45480029b35fd4059c1ce56a2274fa2 (diff)
downloadaur-b6aee4bc327c63aa9df463f9ebc3fe9cd660ff26.tar.gz
Update to 0.14.0
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD6
-rw-r--r--build.patch24
3 files changed, 19 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7eb10cdac015..a0a8e7cc10a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = build2
pkgdesc = build2 build system
- pkgver = 0.13.0
+ pkgver = 0.14.0
pkgrel = 1
url = https://build2.org/
arch = i686
@@ -9,10 +9,9 @@ pkgbase = build2
makedepends = wget
depends = sqlite3
depends = pkgconf
- source = https://download.build2.org/0.13.0/build2-toolchain-0.13.0.tar.xz
+ source = https://download.build2.org/0.14.0/build2-toolchain-0.14.0.tar.xz
source = build.patch
- sha256sums = bafabcab4d5efdc489af59755a3ba7ce90834b479125cf21c34828857cc91506
- sha256sums = d6c3b46e2fd014a6f9771626647c6a9a33ec2c1caefab47d15db129c9c42b66a
+ sha256sums = 18efc6b2d41498f7516e7a8a5c91023f6182c867d423792398390dd0c004cfdd
+ sha256sums = 8405b849e6dc68830102d9e1ce9e934b6bbb63fee05d3dd000c3ed943e5e3638
pkgname = build2
-
diff --git a/PKGBUILD b/PKGBUILD
index 38cfc7e90105..eeb972e63691 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Filipe Verri <filipeverri@gmail.com>
pkgname=build2
-pkgver=0.13.0
+pkgver=0.14.0
pkgrel=1
pkgdesc="build2 build system"
arch=(i686 x86_64)
@@ -14,8 +14,8 @@ depends=('sqlite3' 'pkgconf')
source=("https://download.build2.org/${pkgver}/build2-toolchain-${pkgver}.tar.xz"
"build.patch")
-sha256sums=('bafabcab4d5efdc489af59755a3ba7ce90834b479125cf21c34828857cc91506'
- 'd6c3b46e2fd014a6f9771626647c6a9a33ec2c1caefab47d15db129c9c42b66a')
+sha256sums=('18efc6b2d41498f7516e7a8a5c91023f6182c867d423792398390dd0c004cfdd'
+ '8405b849e6dc68830102d9e1ce9e934b6bbb63fee05d3dd000c3ed943e5e3638')
build() {
cd ${srcdir}/build2-toolchain-${pkgver}
diff --git a/build.patch b/build.patch
index c1623075ed64..a4433eeda0b4 100644
--- a/build.patch
+++ b/build.patch
@@ -1,20 +1,20 @@
---- build.sh.orig 2019-11-20 11:41:28.000000000 +0100
-+++ build.sh 2020-02-11 03:43:42.624594118 +0100
-@@ -368,7 +368,7 @@
- run bpkg-stage $verbose create \
- cc \
+--- build.sh.orig 2021-10-19 12:09:01.000000000 +0200
++++ build.sh 2021-10-20 23:01:48.918991188 +0200
+@@ -516,7 +516,7 @@
+ run build2/build2/b-boot $verbose configure \
+ config.config.hermetic=true \
config.cxx="$cxx" \
-config.cc.coptions="$*" \
+config.cc.coptions="-I/usr/include/pkgconf $*" \
config.bin.lib=shared \
config.bin.rpath="$conf_rpath" \
config.install.root="$idir" \
-@@ -376,7 +376,7 @@
+@@ -620,7 +620,7 @@
- run bpkg-stage $verbose add "$BUILD2_REPO"
- run bpkg-stage $verbose $bpkg_fetch_ops fetch
--run bpkg-stage $verbose $jobs $bpkg_build_ops build --for install --yes --plan= build2 bpkg bdep
-+run bpkg-stage $verbose $jobs $bpkg_build_ops build --for install --yes --plan= build2 bpkg bdep ?sys:libsqlite3 ?sys:libpkgconf
- run bpkg-stage $verbose $jobs install build2 bpkg bdep
+ run "$bpkg_stage" $verbose add "$BUILD2_REPO"
+ run "$bpkg_stage" $verbose $bpkg_fetch_ops fetch
+-run "$bpkg_stage" $verbose $jobs $bpkg_build_ops build --for install --yes --plan= $packages
++run "$bpkg_stage" $verbose $jobs $bpkg_build_ops build --for install --yes --plan= $packages ?sys:libsqlite3 ?sys:libpkgconf
+ run "$bpkg_stage" $verbose $jobs install --all
- run command -v b
+ run command -v "$b"