aarch64: build ninja

omniosorg · Sep 24, 2023 · 194f9b8 · 194f9b8
1 parent c58a936
commit 194f9b8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/build/ninja/build.sh b/build/ninja/build.sh
@@ -12,7 +12,7 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -25,16 +25,21 @@ DESC="A small build system with a focus on speed"
 set_arch 64
 test_relver '>=' 151043 && set_clangver
 
-CONFIGURE_OPTS[amd64]="
-    -DCMAKE_INSTALL_PREFIX=$PREFIX
-    -DCMAKE_BUILD_TYPE=Release
-"
+CONFIGURE_OPTS="-DCMAKE_BUILD_TYPE=Release"
 
 TESTSUITE_MAKE="./ninja_test"
 MAKE_TESTSUITE_ARGS=
 
 TESTSUITE_SED='s/\/[0-9][0-9]*\]/\/...]/'
 
+pre_configure() {
+    typeset arch=$1
+
+    CONFIGURE_OPTS[$arch]="
+        -DCMAKE_INSTALL_PREFIX=$PREFIX
+    "
+}
+
 init
 download_source $PROG "v$VER"
 patch_source

diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64
@@ -6,6 +6,7 @@ extra.omnios ooce/database/bdb
 extra.omnios ooce/database/lmdb
 extra.omnios ooce/database/postgresql-14
 extra.omnios ooce/database/postgresql-common
+extra.omnios ooce/developer/ninja
 extra.omnios ooce/file/tree
 extra.omnios ooce/fonts/liberation
 extra.omnios ooce/library/fontconfig

diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64
@@ -39,6 +39,7 @@ ooce/library/pixman
 ooce/library/libuv
 ooce/library/json-c
 ooce/library/onig
+ooce/developer/ninja
 ###############################################################################
 .SYSROOT
 ooce/audio/flac