Merge pull request #1516 from hadfl/aarch64_cmake

aarch64: build cmake

Author: citrus-it

build/cmake/build.sh

@@ -28,18 +28,38 @@ set_clangver
 
 SKIP_LICENCES=Kitware
 
-MAKE=$NINJA
+XFORM_ARGS="-DPREFIX=${PREFIX#/}"
 
-CONFIGURE_OPTS[amd64]="
-    --prefix=$PREFIX
-    --generator=Ninja
-    --system-curl
+CONFIGURE_OPTS="
+    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX=$PREFIX
+    -DCMAKE_USE_SYSTEM_BZIP2=ON
+    -DCMAKE_USE_SYSTEM_CURL=ON
+    -DCMAKE_USE_SYSTEM_EXPAT=ON
+    -DCMAKE_USE_SYSTEM_LIBLZMA=ON
+    -DCMAKE_USE_SYSTEM_LIBUV=ON
+    -DCMAKE_USE_SYSTEM_ZLIB=ON
+    -DCMAKE_USE_SYSTEM_ZSTD=ON
 "
+CONFIGURE_OPTS[amd64]=
+CONFIGURE_OPTS[aarch64]=
+
+pre_configure() {
+    typeset arch=$1
+
+    ! cross_arch $arch && return
+
+    # setting CMAKE_SYSTEM_NAME will set the internal `CMAKE_CROSSCOMPILING`
+    # to true; this prevents it from using the cross-compiled cmake for install
+    CONFIGURE_OPTS[$arch]+=" -DBUILD_CursesDialog=ON -DCMAKE_SYSTEM_NAME=SunOS"
+
+    LDFLAGS[$arch]+=" -R$PREFIX/${LIBDIRS[$arch]}"
+}
 
 init
 download_source $PROG $PROG $VER
 patch_source
-prep_build autoconf-like
+prep_build cmake+ninja
 build
 make_package
 clean_up

build/cmake/local.mog

@@ -8,7 +8,12 @@
 # source. A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 license Copyright.txt license=Kitware
 
+# cmake will use lib/64 instead of lib/amd64 but does not ship libraries
+# itself. which will lead to a require-any dependency of packages that ship
+# the 64 -> amd64 symlink.
+$(i386_ONLY)link path=$(PREFIX)/lib/64 target=amd64
+

build/ldns/build.sh

@@ -50,6 +50,10 @@ CONFIGURE_OPTS[aarch64]+="
     --with-examples
 "
 
+# Building in parallel produces occasional bad objects that then fail the
+# linking stage. This needs investigation but disable parallelism for now.
+NO_PARALLEL_MAKE=1
+
 # The 'distclean' target clobbers too much including 'configure'
 make_clean() {
     logcmd $MAKE clean

doc/baseline.aarch64

@@ -10,6 +10,7 @@ extra.omnios ooce/database/mariadb-106
 extra.omnios ooce/database/mariadb-common
 extra.omnios ooce/database/postgresql-14
 extra.omnios ooce/database/postgresql-common
+extra.omnios ooce/developer/cmake
 extra.omnios ooce/developer/git-absorb
 extra.omnios ooce/developer/ninja
 extra.omnios ooce/editor/joe

doc/pkglist.aarch64

@@ -89,6 +89,7 @@ ooce/util/jq
 ooce/security/minisign
 ooce/application/links
 ooce/database/mariadb-106
+ooce/developer/cmake
 ###############################################################################
 .SYSROOT
 ooce/network/unbound