summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiguel Revilla2022-08-03 11:24:26 +0200
committerMiguel Revilla2022-08-03 11:24:26 +0200
commit72cfa111fdd32f0fe6b712eff56ff0df828f711c (patch)
tree213f8139e96e9901d22ce34e40d2502f5cc09f97
parent4424cce8e2f4d87fa54b1b53a354dec7d784e8f9 (diff)
downloadaur-72cfa111fdd32f0fe6b712eff56ff0df828f711c.tar.gz
Update to 0.15.0
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD10
-rw-r--r--build.patch15
3 files changed, 13 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dfba1c72d1b2..f5e812d539be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = build2
pkgdesc = build2 build system
- pkgver = 0.14.0
- pkgrel = 2
+ pkgver = 0.15.0
+ pkgrel = 1
url = https://build2.org/
arch = i686
arch = x86_64
@@ -10,9 +10,9 @@ pkgbase = build2
depends = sqlite3
depends = pkgconf
options = !ccache
- source = https://download.build2.org/0.14.0/build2-toolchain-0.14.0.tar.xz
+ source = https://download.build2.org/0.15.0/build2-toolchain-0.15.0.tar.xz
source = build.patch
- sha256sums = 18efc6b2d41498f7516e7a8a5c91023f6182c867d423792398390dd0c004cfdd
- sha256sums = 8405b849e6dc68830102d9e1ce9e934b6bbb63fee05d3dd000c3ed943e5e3638
+ sha256sums = 5152f679daeb9627f9710c60ef88de1591c02097146268be2f5aea929d2837c4
+ sha256sums = fa551d0fa42c622caa147acc42944ea709d6147ce91847bb9bc86be321b09fdf
pkgname = build2
diff --git a/PKGBUILD b/PKGBUILD
index d5277a8cbfff..f6fbe5fe412f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Filipe Verri <filipeverri@gmail.com>
pkgname=build2
-pkgver=0.14.0
-pkgrel=2
+pkgver=0.15.0
+pkgrel=1
pkgdesc="build2 build system"
arch=(i686 x86_64)
url="https://build2.org/"
@@ -15,8 +15,8 @@ depends=('sqlite3' 'pkgconf')
source=("https://download.build2.org/${pkgver}/build2-toolchain-${pkgver}.tar.xz"
"build.patch")
-sha256sums=('18efc6b2d41498f7516e7a8a5c91023f6182c867d423792398390dd0c004cfdd'
- '8405b849e6dc68830102d9e1ce9e934b6bbb63fee05d3dd000c3ed943e5e3638')
+sha256sums=('5152f679daeb9627f9710c60ef88de1591c02097146268be2f5aea929d2837c4'
+ 'fa551d0fa42c622caa147acc42944ea709d6147ce91847bb9bc86be321b09fdf')
build() {
cd ${srcdir}/build2-toolchain-${pkgver}
@@ -24,7 +24,7 @@ build() {
patch -p0 < ${srcdir}/build.patch
mkdir -p ${srcdir}/build/usr
- ./build.sh --trust yes --install-dir ${srcdir}/build/usr ${CXX:-g++} $CXXFLAGS
+ ./build.sh --trust yes --local --system libsqlite3,libpkgconfig --install-dir ${srcdir}/build/usr ${CXX:-g++} $CXXFLAGS
for f in ${srcdir}/build/usr/lib/pkgconfig/*.pc; do sed -i "s|${srcdir}/build||" ${f}; done
}
diff --git a/build.patch b/build.patch
index a4433eeda0b4..0163ddf8f1c7 100644
--- a/build.patch
+++ b/build.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- build.sh.orig 2022-07-28 15:16:00.000000000 +0200
++++ build.sh 2022-08-02 22:15:53.761448625 +0200
+@@ -597,7 +597,7 @@
run build2/build2/b-boot $verbose configure \
config.config.hermetic=true \
config.cxx="$cxx" \
@@ -9,12 +9,3 @@
config.bin.lib=shared \
config.bin.rpath="$conf_rpath" \
config.install.root="$idir" \
-@@ -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= $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"