Totally new PKGBUILD with a more proper install

3 files changed, 48 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b88468dda95..3c1fa6d37ee3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,18 @@
 pkgbase = build2
 	pkgdesc = build2 build system
 	pkgver = 0.12.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://build2.org/
 	arch = i686
 	arch = x86_64
 	license = MIT
 	makedepends = wget
+	depends = sqlite3
+	depends = pkgconf
 	source = https://download.build2.org/0.12.0/build2-toolchain-0.12.0.tar.xz
+	source = build.patch
 	sha256sums = a0ecf9930b873242a0164653411caca2cc5c095abda5ee7bda800f1b0f93e396
+	sha256sums = d6c3b46e2fd014a6f9771626647c6a9a33ec2c1caefab47d15db129c9c42b66a
 
 pkgname = build2
 
diff --git a/PKGBUILD b/PKGBUILD
index d638147fb9cf..e914b620e9f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,37 @@
-# Maintainer: Adrià Arrufat <swiftscythe@gmail.com>
+# Maintainer: Miguel Revilla <yo at miguelrevilla dot com>
+# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
 # Contributor: Filipe Verri <filipeverri@gmail.com>
 
 pkgname=build2
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="build2 build system"
 arch=(i686 x86_64)
 url="https://build2.org/"
 license=('MIT')
-makedepends=(wget)
-source=("https://download.build2.org/$pkgver/build2-toolchain-$pkgver.tar.xz")
-sha256sums=('a0ecf9930b873242a0164653411caca2cc5c095abda5ee7bda800f1b0f93e396')
+makedepends=('wget')
+depends=('sqlite3' 'pkgconf')
+source=("https://download.build2.org/${pkgver}/build2-toolchain-${pkgver}.tar.xz"
+		"build.patch")
+
+sha256sums=('a0ecf9930b873242a0164653411caca2cc5c095abda5ee7bda800f1b0f93e396'
+            'd6c3b46e2fd014a6f9771626647c6a9a33ec2c1caefab47d15db129c9c42b66a')
 
 build() {
-  cd build2-toolchain-$pkgver
-  mkdir -p install
-  ./build.sh --trust yes --install-dir `pwd`/install g++
+  cd ${srcdir}/build2-toolchain-${pkgver}
+
+  patch -p0 < ${srcdir}/build.patch
+
+  mkdir -p ${srcdir}/build/usr
+  ./build.sh --trust yes --install-dir ${srcdir}/build/usr g++
+
+  for f in ${srcdir}/build/usr/lib/pkgconfig/*.pc; do sed -i "s|${srcdir}/build||" ${f}; done
 }
 
 package() {
-  cd build2-toolchain-$pkgver
-  mkdir -p "$pkgdir/usr/bin"
-  cp install/bin/* "$pkgdir/usr/bin/"
-  mkdir -p "$pkdir/usr/share"
-  cp -R install/share/ "$pkgdir/usr/share/"
-  mkdir -p "$pkdir/usr/lib"
-  cp -R install/lib/ "$pkgdir/usr/lib/"
-  rm $pkgdir/usr/lib/{libsqlite3.so,libpkgconf.so}
-  mkdir -p "$pkgdir/usr/share/licenses/$pkgname/"
-  install -Dm644 ./build2/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  cd ${srcdir}/build
+  cp -av usr ${pkgdir}
+
+  mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}/
+  mv ${pkgdir}/usr/share/doc/build2/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/
 }
diff --git a/build.patch b/build.patch
new file mode 100644
index 000000000000..c1623075ed64
--- /dev/null
+++ b/build.patch
@@ -0,0 +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 \
+ 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 @@
+ 
+ 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 command -v b