Change to native dependencies (LOCALBASE bootstrapping)

For now, we'll build libgit2 from source, due to a regression in the
current version (shipped with Arch), which will be fixed in the next
release.

2 files changed, 22 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9c9beee11d03..8d161b861f76 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,8 +8,19 @@ pkgbase = justbuild
 	makedepends = clang
 	makedepends = binutils
 	makedepends = wget
-	makedepends = pandoc
+	makedepends = cli11
+	makedepends = microsoft-gsl
+	makedepends = nlohmann-json
+	depends = fmt
+	depends = openssl
+	depends = zlib
+	depends = re2
+	depends = c-ares
+	depends = grpc
+	depends = abseil-cpp
+	depends = curl
 	depends = python
+	depends = protobuf
 	conflicts = just
 	conflicts = just-git
 	conflicts = just-js
diff --git a/PKGBUILD b/PKGBUILD
index ae9a2ac77bcf..7575f271f75a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ pkgdesc="A generic build system supporting multi-repository builds"
 arch=('x86_64')
 url="https://github.com/just-buildsystem/justbuild"
 license=('Apache')
-depends=('python')
-makedepends=('clang' 'binutils' 'wget' 'pandoc')
+depends=('fmt' 'openssl' 'zlib' 're2' 'c-ares' 'grpc' 'abseil-cpp' 'curl' 'python' 'protobuf')
+makedepends=('clang' 'binutils' 'wget' 'cli11' 'microsoft-gsl' 'nlohmann-json' 'pandoc')
 conflicts=('just' 'just-git' 'just-js')
 source=("justbuild-${pkgver}.tar.gz::https://github.com/just-buildsystem/justbuild/archive/v${pkgver}.tar.gz")
 sha256sums=('75b7d92d233250fa9751542cf5020c10b20e178f898b3fe1294fc9013b4ad5fe')
@@ -17,16 +17,20 @@ build() {
     cd "${srcdir}/justbuild-${pkgver}"
     # Clean build directory from potential previous run
     # The bootstrap script expects the build directory to be clean; esp. src, dep_includes and deps must not be present
-    [[ -d "${srcdir}/build/dep_includes" ]] && rm -rf "${srcdir}/build"
+    [[ -d "${srcdir}/build/src" ]] && rm -rf "${srcdir}/build"
     mkdir -p "${srcdir}/build"
 
     # Bootstrap just
-    env JUST_BUILD_CONF='{"COMPILER_FAMILY": "clang", "CC": "/usr/bin/clang", "CXX": "/usr/bin/clang++", "AR": "/usr/bin/ar"}' python3 ./bin/bootstrap.py . "${srcdir}/build"
+    env JUST_BUILD_CONF='{"COMPILER_FAMILY": "clang", "CC": "/usr/bin/clang", "CXX": "/usr/bin/clang++", "AR": "/usr/bin/ar"}'\
+            PACKAGE=YES\
+            LOCALBASE=/usr\
+            NON_LOCAL_DEPS='["bazel_remote_apis", "google_apis", "com_github_libgit2_libgit2"]'\
+        python3 ./bin/bootstrap.py . ${srcdir}/build
 
     # Build compiled just-mr
-    python ./bin/just-mr.py --just "../build/out/bin/just" --always-file install 'installed just-mr' --output-dir ../build/out -D '{"COMPILER_FAMILY": "clang", "CC": "/usr/bin/clang", "CXX": "/usr/bin/clang++", "AR": "/usr/bin/ar"}'
+    ../build/out/bin/just install 'installed just-mr' -c ../build/build-conf.json -C ../build/repo-conf.json --output-dir ../build/out
 
-    # convert man pages from orgmode to man
+    # convert man pages from Markdown to man
     find "${srcdir}/justbuild-${pkgver}/share/man" -name "*.md" -exec sh -c 'pandoc --standalone --to man -o "${0%.md}.man" "${0}"' {} \;
 }