From 89d3246b5829a6009b067e26d1ed0998b9adf061 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 12 Oct 2024 13:27:00 +0000 Subject: [PATCH 1/8] aarch64: build rlwrap --- build/rlwrap/build.sh | 8 +++++++- doc/baseline.aarch64 | 1 + doc/pkglist.aarch64 | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build/rlwrap/build.sh b/build/rlwrap/build.sh index 25a349327..f96f41ab6 100755 --- a/build/rlwrap/build.sh +++ b/build/rlwrap/build.sh @@ -13,7 +13,7 @@ # }}} # Copyright 2022 r7st r7st.guru@gmail.com -# Copyright 2023 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh @@ -26,6 +26,12 @@ DESC+="Readline library to allow the editing of keyboard input for any command." set_arch 64 +pre_configure() { + typeset arch=$1 + + CPPFLAGS[$arch]+=" -I${SYSROOT[$arch]}/usr/include" +} + init download_source $PROG $PROG $VER patch_source diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64 index 783e2e7d6..ee59cbaac 100644 --- a/doc/baseline.aarch64 +++ b/doc/baseline.aarch64 @@ -91,6 +91,7 @@ extra.omnios ooce/util/hyperfine extra.omnios ooce/util/jq extra.omnios ooce/util/pass extra.omnios ooce/util/rargs +extra.omnios ooce/util/rlwrap extra.omnios ooce/util/stress-ng extra.omnios ooce/util/u-boot extra.omnios ooce/util/xjobs diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64 index abfe75073..3e92c579e 100644 --- a/doc/pkglist.aarch64 +++ b/doc/pkglist.aarch64 @@ -74,6 +74,7 @@ ooce/library/jansson ooce/network/tcpdump ooce/system/top ooce/library/apr +ooce/util/rlwrap ############################################################################### .SYSROOT ooce/audio/flac From 9e43681b3a61f18838925e4d20ef26e1450d66c5 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 12 Oct 2024 15:03:06 +0000 Subject: [PATCH 2/8] aarch64: build protobuf --- build/protobuf/build.sh | 14 ++++++++++++-- doc/baseline.aarch64 | 1 + doc/pkglist.aarch64 | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/build/protobuf/build.sh b/build/protobuf/build.sh index 18a4f822e..6963b0afd 100755 --- a/build/protobuf/build.sh +++ b/build/protobuf/build.sh @@ -31,8 +31,18 @@ CONFIGURE_OPTS=" -DCMAKE_POSITION_INDEPENDENT_CODE=ON -Dprotobuf_BUILD_TESTS=OFF " -CONFIGURE_OPTS[i386]="-DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[i386]}" -CONFIGURE_OPTS[amd64]="-DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[amd64]}" + +pre_configure() { + typeset arch=$1 + + CONFIGURE_OPTS[$arch]=" + -DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[$arch]} + -DZLIB_INCLUDE_DIR=${SYSROOT[$arch]}/usr/include + -DZLIB_LIBRARY_RELEASE=${SYSROOT[$arch]}/usr/${LIBDIRS[$arch]}/libz.so + " +} + +CXXFLAGS[aarch64]+=" -mtls-dialect=trad" init clone_github_source $PROG "$GITHUB/protocolbuffers/$PROG" v$VER diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64 index ee59cbaac..8ef51b6aa 100644 --- a/doc/baseline.aarch64 +++ b/doc/baseline.aarch64 @@ -13,6 +13,7 @@ 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/developer/protobuf extra.omnios ooce/editor/joe extra.omnios ooce/file/tree extra.omnios ooce/fonts/liberation diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64 index 3e92c579e..d3c25b0d6 100644 --- a/doc/pkglist.aarch64 +++ b/doc/pkglist.aarch64 @@ -75,6 +75,7 @@ ooce/network/tcpdump ooce/system/top ooce/library/apr ooce/util/rlwrap +ooce/developer/protobuf ############################################################################### .SYSROOT ooce/audio/flac From 3af7f4025171a09b7b302ddfe5900e5aa7f4d8eb Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 12 Oct 2024 15:09:15 +0000 Subject: [PATCH 3/8] aarch64: build mosh --- build/mosh/build.sh | 3 ++- doc/baseline.aarch64 | 1 + doc/pkglist.aarch64 | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/mosh/build.sh b/build/mosh/build.sh index 79c67a166..def40a475 100755 --- a/build/mosh/build.sh +++ b/build/mosh/build.sh @@ -12,7 +12,7 @@ # http://www.illumos.org/license/CDDL. # }}} -# Copyright 2022 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh @@ -25,6 +25,7 @@ DESC="Remote terminal application that allows roaming" set_arch 64 CXXFLAGS[amd64]+=" -std=c++17" +CXXFLAGS[aarch64]+=" -std=c++17" init download_source $PROG $PROG $VER diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64 index 8ef51b6aa..d91ab8f11 100644 --- a/doc/baseline.aarch64 +++ b/doc/baseline.aarch64 @@ -66,6 +66,7 @@ extra.omnios ooce/multimedia/x264 extra.omnios ooce/multimedia/x265 extra.omnios ooce/network/fping extra.omnios ooce/network/irssi +extra.omnios ooce/network/mosh extra.omnios ooce/network/nsd extra.omnios ooce/network/openldap extra.omnios ooce/network/smtp/postfix diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64 index d3c25b0d6..8fa56bfa9 100644 --- a/doc/pkglist.aarch64 +++ b/doc/pkglist.aarch64 @@ -92,6 +92,7 @@ ooce/security/minisign ooce/application/links ooce/database/mariadb-106 ooce/developer/cmake +ooce/network/mosh ############################################################################### .SYSROOT ooce/network/unbound From be5301515a8bc76b296c8f78296e29d4abc50eb1 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 12 Oct 2024 15:22:54 +0000 Subject: [PATCH 4/8] aarch64: build libdwarf --- build/libdwarf/build.sh | 4 ++-- build/libdwarf/local.mog | 4 ++-- doc/baseline.aarch64 | 1 + doc/pkglist.aarch64 | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build/libdwarf/build.sh b/build/libdwarf/build.sh index 2e1f37083..a734298b7 100755 --- a/build/libdwarf/build.sh +++ b/build/libdwarf/build.sh @@ -12,7 +12,7 @@ # http://www.illumos.org/license/CDDL. # }}} -# Copyright 2021 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh @@ -40,7 +40,7 @@ init download_source $PROG $PROG $VER prep_build patch_source -build -ctf +build make_package clean_up diff --git a/build/libdwarf/local.mog b/build/libdwarf/local.mog index 431cd9060..478c847ad 100644 --- a/build/libdwarf/local.mog +++ b/build/libdwarf/local.mog @@ -8,13 +8,13 @@ # source. A copy of the CDDL is also available via the Internet at # http://www.illumos.org/license/CDDL. # -# Copyright 2020 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. drop> license dwarfdump/GPL.txt license=GPLv2 license libdwarf/LGPL.txt license=LGPLv2.1 license dwarfdump/DWARFDUMPCOPYRIGHT license=dwarfdump -license libdwarf/LIBDWARFCOPYRIGHT license=libdwarf +license libdwarf/LIBDWARFCOPYRIGHT license=libdwarfcopy license COPYING license=libdwarf diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64 index d91ab8f11..7dbaa99ca 100644 --- a/doc/baseline.aarch64 +++ b/doc/baseline.aarch64 @@ -28,6 +28,7 @@ extra.omnios ooce/library/json-c extra.omnios ooce/library/ldns extra.omnios ooce/library/libarchive extra.omnios ooce/library/libde265 +extra.omnios ooce/library/libdwarf extra.omnios ooce/library/libev extra.omnios ooce/library/libexif extra.omnios ooce/library/libgd diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64 index 8fa56bfa9..99b564f28 100644 --- a/doc/pkglist.aarch64 +++ b/doc/pkglist.aarch64 @@ -76,6 +76,7 @@ ooce/system/top ooce/library/apr ooce/util/rlwrap ooce/developer/protobuf +ooce/library/libdwarf ############################################################################### .SYSROOT ooce/audio/flac From d0095a183abd773dab82db85aa3095643a3ca747 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 12 Oct 2024 15:46:21 +0000 Subject: [PATCH 5/8] aarch64: build libmcrypt --- build/libmcrypt/build.sh | 12 ++++++++++++ doc/baseline.aarch64 | 1 + doc/pkglist.aarch64 | 1 + 3 files changed, 14 insertions(+) diff --git a/build/libmcrypt/build.sh b/build/libmcrypt/build.sh index 4d8fd1fb0..d217ca13d 100755 --- a/build/libmcrypt/build.sh +++ b/build/libmcrypt/build.sh @@ -33,6 +33,18 @@ XFORM_ARGS=" CONFIGURE_OPTS+=" --mandir=$PREFIX/share/man " + +pre_configure() { + typeset arch=$1 + + ! cross_arch $arch && return + + CONFIGURE_OPTS[$arch]+=" + ac_cv_func_malloc_0_nonnull=yes + ac_cv_func_realloc_0_nonnull=yes + " +} + LDFLAGS[i386]+=" -lssp_ns" init diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64 index 7dbaa99ca..2eb3c37d7 100644 --- a/doc/baseline.aarch64 +++ b/doc/baseline.aarch64 @@ -36,6 +36,7 @@ extra.omnios ooce/library/libgif extra.omnios ooce/library/libheif extra.omnios ooce/library/libid3tag extra.omnios ooce/library/libjpeg-turbo +extra.omnios ooce/library/libmcrypt extra.omnios ooce/library/libogg extra.omnios ooce/library/libpng extra.omnios ooce/library/libsodium diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64 index 99b564f28..edb019a6a 100644 --- a/doc/pkglist.aarch64 +++ b/doc/pkglist.aarch64 @@ -77,6 +77,7 @@ ooce/library/apr ooce/util/rlwrap ooce/developer/protobuf ooce/library/libdwarf +ooce/library/libmcrypt ############################################################################### .SYSROOT ooce/audio/flac From dc107fe12f9d9b55c79eeed9c3885071dff4e77e Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 12 Oct 2024 15:49:51 +0000 Subject: [PATCH 6/8] aarch64: build sic --- doc/baseline.aarch64 | 1 + doc/pkglist.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64 index 2eb3c37d7..d7262926c 100644 --- a/doc/baseline.aarch64 +++ b/doc/baseline.aarch64 @@ -71,6 +71,7 @@ extra.omnios ooce/network/irssi extra.omnios ooce/network/mosh extra.omnios ooce/network/nsd extra.omnios ooce/network/openldap +extra.omnios ooce/network/sic extra.omnios ooce/network/smtp/postfix extra.omnios ooce/network/tcpdump extra.omnios ooce/network/unbound diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64 index edb019a6a..a00ba6aff 100644 --- a/doc/pkglist.aarch64 +++ b/doc/pkglist.aarch64 @@ -78,6 +78,7 @@ ooce/util/rlwrap ooce/developer/protobuf ooce/library/libdwarf ooce/library/libmcrypt +ooce/network/sic ############################################################################### .SYSROOT ooce/audio/flac From d700b12d832d4a49c61170c8e79261c8423dbfaa Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 12 Oct 2024 15:51:49 +0000 Subject: [PATCH 7/8] aarch64: build tig --- doc/baseline.aarch64 | 1 + doc/pkglist.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64 index d7262926c..f7c2d1958 100644 --- a/doc/baseline.aarch64 +++ b/doc/baseline.aarch64 @@ -1,6 +1,7 @@ extra.omnios ooce/application/links extra.omnios ooce/application/mc extra.omnios ooce/application/mutt +extra.omnios ooce/application/tig extra.omnios ooce/audio/flac extra.omnios ooce/compress/pbzip2 extra.omnios ooce/compress/pigz diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64 index a00ba6aff..2f89bca0c 100644 --- a/doc/pkglist.aarch64 +++ b/doc/pkglist.aarch64 @@ -79,6 +79,7 @@ ooce/developer/protobuf ooce/library/libdwarf ooce/library/libmcrypt ooce/network/sic +ooce/application/tig ############################################################################### .SYSROOT ooce/audio/flac From f64aa4fc15b4009dccea62cd30e97bd2f5f38a83 Mon Sep 17 00:00:00 2001 From: Dominik Hassler Date: Sat, 12 Oct 2024 16:09:55 +0000 Subject: [PATCH 8/8] aarch64: build cunit --- build/cunit/build.sh | 9 +++++---- build/cunit/files/ctf.ignore | 1 + build/cunit/local.mog | 3 ++- doc/baseline.aarch64 | 1 + doc/pkglist.aarch64 | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 build/cunit/files/ctf.ignore diff --git a/build/cunit/build.sh b/build/cunit/build.sh index 9892c9a73..af35a6644 100755 --- a/build/cunit/build.sh +++ b/build/cunit/build.sh @@ -12,7 +12,7 @@ # http://www.illumos.org/license/CDDL. # }}} -# Copyright 2018 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. . ../../lib/build.sh @@ -21,7 +21,9 @@ VER=2.1-3 VERHUMAN=$VER PKG=ooce/developer/cunit SUMMARY="C Unit Testing Framework" -DESC="$SUMMARY" +DESC="$PROG - $SUMMARY" + +test_relver '>=' 151053 && set_clangver BUILDDIR=CUnit-$VER @@ -40,8 +42,7 @@ prep_build patch_source run_autoreconf -fi build -VER=${VER//-/.} -make_package +VER=${VER//-/.} make_package clean_up # Vim hints diff --git a/build/cunit/files/ctf.ignore b/build/cunit/files/ctf.ignore new file mode 100644 index 000000000..f6e2b38c8 --- /dev/null +++ b/build/cunit/files/ctf.ignore @@ -0,0 +1 @@ +MyMem.c diff --git a/build/cunit/local.mog b/build/cunit/local.mog index c5c4d4722..2acda8b81 100644 --- a/build/cunit/local.mog +++ b/build/cunit/local.mog @@ -8,10 +8,11 @@ # source. A copy of the CDDL is also available via the Internet at # http://www.illumos.org/license/CDDL. -# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2024 OmniOS Community Edition (OmniOSce) Association. license COPYING license=LGPLv2 drop> + drop> drop> diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64 index f7c2d1958..5f5887249 100644 --- a/doc/baseline.aarch64 +++ b/doc/baseline.aarch64 @@ -12,6 +12,7 @@ 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/cunit extra.omnios ooce/developer/git-absorb extra.omnios ooce/developer/ninja extra.omnios ooce/developer/protobuf diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64 index 2f89bca0c..1831f74e9 100644 --- a/doc/pkglist.aarch64 +++ b/doc/pkglist.aarch64 @@ -80,6 +80,7 @@ ooce/library/libdwarf ooce/library/libmcrypt ooce/network/sic ooce/application/tig +ooce/developer/cunit ############################################################################### .SYSROOT ooce/audio/flac