tebako 0.5.5 → 0.5.7

data/tools/README.md

@@ -1,5 +1,49 @@
 [![lint](https://github.com/tamatebako/macos-cross-compile/actions/workflows/lint.yml/badge.svg)](https://github.com/tamatebako/macos-cross-compile/actions/workflows/lint.yml)
+[![test](https://github.com/tamatebako/tebako-tools/actions/workflows/test.yml/badge.svg)](https://github.com/tamatebako/tebako-tools/actions/workflows/test.yml)
 
 ## Tebako portability tools ##
 
 This repository contains cmake, shell scripts and include files aimed to support tebako builds on different platforms.
+
+## Homebrew cross-installation scripts ##
+
+Sometimes you need to build MacOS application in a foreign environment. For example, GitHub Actions provides x86 runners only, but you may need to build and package arm64 binary.
+Most of the applications rely on external dependencies, so on MacOS you will require a method to use another instance of homebrew to support the target environment.
+
+Among other tools this repository provides a set of simple scripts to cross install homebrew dependencies
+
+### arm64 packages on x86_64 system
+
+```
+    arm-brew-install <arm brew parent folder>
+    arm-brew-setup <arm brew folder> <formula to install 1> ... <formula to install 1>
+```
+
+For example
+
+```
+    arm-brew-install ~/test
+    arm-brew-setup ~/test glog gflags
+```
+
+Will create arm brew environment in ~/test/arm-homebrew and install glog and gflags formulae there
+
+
+### x86_64 packages on arm system
+
+```
+    x86_64-brew-install <x86_64 brew parent folder>
+    x86_64-brew-setup <x86_64 brew folder> <formula to install 1> ... <formula to install 1>
+```
+
+For example
+
+```
+    x86_64-brew-install ~/test
+    x86_64-brew-setup ~/test glog gflags
+```
+
+Will create x86_64 brew environment in ~/test/x86_64-homebrew and install glog and gflags formulae there
+
+There are related discussions at https://github.com/orgs/Homebrew/discussions/2843
+and https://stackoverflow.com/questions/70821136/can-i-install-arm64-libraries-on-x86-64-with-homebrew/70822921#70822921

data/tools/ci-scripts/patch-fbthrift.sh

@@ -35,7 +35,12 @@ restore_and_save() {
 
 do_patch() {
   restore_and_save "$1"
-  sed -i "s/$2/$3/g" "$1"
+  "$gSed" -i "s/$2/$3/g" "$1"
+}
+
+do_patch_multiline() {
+  restore_and_save "$1"
+  "$gSed" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1"
 }
 
 # ....................................................
@@ -80,6 +85,21 @@ restore_and_save "$1/CMakeLists.txt"
 re="find_package(OpenSSL REQUIRED)"
 "$gSed" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/CMakeLists.txt"
 
+# GCC 13 compatibility
+# --- thrift/compiler/lib/cpp2/util.cc ---
+re="#include <stdexcept>"
+# shellcheck disable=SC2251
+! IFS= read -r -d '' sbst << EOM
+#include <stdexcept>
+
+\/* -- Start of tebako patch -- *\/
+#include <cstdint>
+\/* -- End of tebako patch -- *\/
+EOM
+
+do_patch_multiline "$1/thrift/compiler/lib/cpp2/util.cc"
+
+
 if [[ "$OSTYPE" == "msys" ]]; then
   re="if(WIN32)"
   sbst="if(MSVC) # tebako patched"

data/tools/ci-scripts/patch-folly.sh

@@ -1,5 +1,5 @@
 #! /bin/bash
-# Copyright (c) 2022, [Ribose Inc](https://www.ribose.com).
+# Copyright (c) 2022-2023, [Ribose Inc](https://www.ribose.com).
 # All rights reserved.
 # This file is a part of tebako
 #
@@ -26,6 +26,12 @@
 
 set -o errexit -o pipefail -o noclobber -o nounset
 
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  GNU_SED="gsed"
+else
+  GNU_SED="sed"
+fi
+
 # ....................................................
 restore_and_save() {
   echo "Patching $1"
@@ -35,12 +41,12 @@ restore_and_save() {
 
 do_patch() {
   restore_and_save "$1"
-  sed -i "s/$2/$3/g" "$1"
+  "$GNU_SED" -i "s/$2/$3/g" "$1"
 }
 
 do_patch_multiline() {
   restore_and_save "$1"
-  sed -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1"
+  "$GNU_SED" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1"
 }
 
 defined_win32_to_msc_ver() {
@@ -50,7 +56,7 @@ defined_win32_to_msc_ver() {
 
   re="#ifdef _WIN32"
   sbst="#ifdef _MSC_VER \/* tebako patched *\/ "
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 }
 
 defined_n_win32_to_msc_ver() {
@@ -60,7 +66,7 @@ defined_n_win32_to_msc_ver() {
 
   re="#ifndef _WIN32"
   sbst="#ifndef _MSC_VER \/* tebako patched *\/ "
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 }
 
 defined_msc_ver_to_win32() {
@@ -70,7 +76,7 @@ defined_msc_ver_to_win32() {
 
   re="#ifdef _MSC_VER"
   sbst="#ifdef _WIN32 \/* tebako patched *\/ "
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 }
 
 funky_stdio_patch() {
@@ -80,11 +86,11 @@ funky_stdio_patch() {
 
   re="FILE\* popen(const char\* name, const char\* mode)"
   sbst="FILE* _folly_popen(const char* name, const char* mode) \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 
   re="int vasprintf(char\*\* dest, const char\* format, va_list ap)"
   sbst="int _folly_vasprintf(char** dest, const char* format, va_list ap) \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 }
 
 funky_sysstat_patch() {
@@ -94,15 +100,15 @@ funky_sysstat_patch() {
 
   re="int mkdir(const char\* fn, int mode)"
   sbst="int _folly_mkdir(const char* fn, int mode) \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 
   re="int mkdir(const char\* fn, int \/\* mode \*\/)"
   sbst="int _folly_mkdir(const char* fn, int \/* mode *\/) \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 
   re="int umask(int md)"
   sbst="int _folly_umask(int md) \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 }
 
 funky_string_patch() {
@@ -112,7 +118,7 @@ funky_string_patch() {
 
   re="int strncasecmp(const char\* a, const char\* b, size_t c)"
   sbst="int _folly_strncasecmp(const char* a, const char* b, size_t c) \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 }
 
 funky_time_patch() {
@@ -122,11 +128,11 @@ funky_time_patch() {
 
   re="tm\* gmtime_r(const time_t\* t, tm\* res)"
   sbst="tm* _folly_gmtime_r(const time_t* t, tm* res) \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 
   re="tm\* localtime_r(const time_t\* t, tm\* o)"
   sbst="tm* _folly_localtime_r(const time_t* t, tm* o) \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1"
 }
 
 funky_formatter_patch() {
@@ -138,13 +144,13 @@ funky_formatter_patch() {
 if [[ "$OSTYPE" == "linux-musl"* ]]; then
 # https://github.com/facebook/folly/issues/1478
   re="#elif defined(__FreeBSD__)"
-  sbst="#else    \/* Tebako patched *\/"
+  sbst="#elif defined(__FreeBSD__) || defined(__musl__)  \/* Tebako patched *\/"
   do_patch "$1/folly/experimental/symbolizer/Elf.cpp" "$re" "$sbst"
 
   restore_and_save "$1/CMake/FollyConfigChecks.cmake"
   re="FOLLY_HAVE_IFUNC"
   sbst="FOLLY_HAVE_IFUNC_NOT_PATCHED"
-  sed -i "s/$re/$sbst/g" "$1/CMake/FollyConfigChecks.cmake"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/CMake/FollyConfigChecks.cmake"
 
   re="set(CMAKE_REQUIRED_FLAGS \"\${FOLLY_ORIGINAL_CMAKE_REQUIRED_FLAGS}\")"
 
@@ -164,7 +170,29 @@ check_cxx_source_runs(\"
 # -- End of tebako patch --
 EOM
 
-  sed -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/CMake/FollyConfigChecks.cmake"
+  "$GNU_SED" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/CMake/FollyConfigChecks.cmake"
+
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+  re="  set(OPENSSL_ROOT_DIR \"\/usr\/local\/opt\/openssl\" )"
+
+# shellcheck disable=SC2251
+! IFS= read -r -d '' sbst << EOM
+# -- Start of tebako patch --
+ if (NOT OPENSSL_ROOT_DIR)
+   set(OPENSSL_ROOT_DIR \"\/usr\/local\/opt\/openssl\")
+ endif(NOT OPENSSL_ROOT_DIR)
+# -- End of tebako patch --
+EOM
+
+  do_patch_multiline  "$1/CMakeLists.txt" "$re" "$sbst"
+
+  re="set(OPENSSL_LIBRARIES \"\/usr\/local\/opt\/openssl\/lib\" )"
+  sbst="set(OPENSSL_LIBRARIES \"\${OPENSSL_ROOT_DIR}\/lib\")    # tebako patched"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/CMakeLists.txt"
+
+  re="set(OPENSSL_INCLUDE_DIR \"\/usr\/local\/opt\/openssl\/include\" )"
+  sbst="set(OPENSSL_INCLUDE_DIR \"\${OPENSSL_ROOT_DIR}\/include\")    # tebako patched"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/CMakeLists.txt"
 
 elif [[ "$OSTYPE" == "msys"* ]]; then
 # --- folly/portability/Stdlib.h ---
@@ -184,11 +212,11 @@ elif [[ "$OSTYPE" == "msys"* ]]; then
 
   re="using mode_t = unsigned int;"
   sbst="\/* using mode_t = unsigned int; --- tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1/folly/portability/SysTypes.h"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/SysTypes.h"
 
   re="using uid_t = int;"
   sbst="using uid_t = short; \/* --- tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1/folly/portability/SysTypes.h"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/SysTypes.h"
 
   re="using gid_t = int;"
   # shellcheck disable=SC2251
@@ -196,7 +224,7 @@ elif [[ "$OSTYPE" == "msys"* ]]; then
 using gid_t = short; \/* --- tebako patched *\/
 using nlink_t = short; \/* --- tebako patched *\/
 EOM
-  sed -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/folly/portability/SysTypes.h"
+  "$GNU_SED" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/folly/portability/SysTypes.h"
 
 # --- folly/portability/SysStat.cpp ---
   funky_sysstat_patch "$1/folly/portability/SysStat.cpp"
@@ -210,7 +238,7 @@ EOM
 \/* -- Start of tebako patch --
 #define S_IXUSR 0
 EOM
-  sed -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/folly/portability/SysStat.h"
+  "$GNU_SED" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/folly/portability/SysStat.h"
 
   re="#define S_ISREG(mode) (((mode) & (_S_IFREG)) == (_S_IFREG) ? 1 : 0)"
   # shellcheck disable=SC2251
@@ -223,7 +251,7 @@ EOM
 
 \/* -- End of tebako patch -- *\/
 EOM
-  sed -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/folly/portability/SysStat.h"
+  "$GNU_SED" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/folly/portability/SysStat.h"
 
 # --- folly/portability/SysTime.h ---
   re="int gettimeofday(timeval\* tv, folly_port_struct_timezone\*);"
@@ -234,54 +262,54 @@ EOM
   defined_msc_ver_to_win32 "$1/folly/FileUtil.cpp"
   re="(open,"
   sbst="(\/* tebako patched *\/ folly::portability::fcntl::open,"
-  sed -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
 
   re="close(tmpFD)"
   sbst="\/* tebako patched *\/ folly::portability::unistd::close(tmpFD)"
-  sed -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
 
   re="(close(fd))"
   sbst="(\/* tebako patched *\/ folly::portability::unistd::close(fd))"
-  sed -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
 
   re="(read,"
   sbst="(\/* tebako patched *\/ folly::portability::unistd::read,"
-  sed -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
 
   re="(write,"
   sbst="(\/* tebako patched *\/ folly::portability::unistd::write,"
-  sed -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
 
   re="(dup,"
   sbst="(\/* tebako patched *\/ folly::portability::unistd::dup,"
-  sed -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
 
   re="(dup2,"
   sbst="(\/* tebako patched *\/ folly::portability::unistd::dup2,"
-  sed -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/FileUtil.cpp"
 
 # --- folly/experimental/TestUtil.cpp ---
   defined_win32_to_msc_ver "$1/folly/experimental/TestUtil.cpp"
   re="dup("
   sbst="\/* tebako patched *\/ folly::portability::unistd::dup("
-  sed -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
 
   re="dup2("
   sbst="\/* tebako patched *\/ folly::portability::unistd::dup2("
-  sed -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
 
   re="lseek("
   sbst="\/* tebako patched *\/ folly::portability::unistd::lseek("
-  sed -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
 
   re="(close("
   sbst="(\/* tebako patched *\/ folly::portability::unistd::close("
-  sed -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/experimental/TestUtil.cpp"
 
 # --- folly/system/MemoryMapping.cpp ---
   re="0 == ftruncate("
   sbst="0 == \/* tebako patched *\/ folly::portability::unistd::ftruncate("
-  sed -i "s/$re/$sbst/g" "$1/folly/system/MemoryMapping.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/system/MemoryMapping.cpp"
 
 # --- folly/portability/SysUio.cpp ---
   re="lseek(fd,"
@@ -295,7 +323,7 @@ EOM
 
   re="lseek(fd, 0,"
   sbst=" \/* tebako patched *\/ folly::portability::unistd::lseek(fd, 0,"
-  sed -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.cpp"
 
 # --- folly/logging/ImmediateFileWriter.h ---
   re="isatty(file"
@@ -314,11 +342,11 @@ EOM
 
   re="int getuid();"
   sbst="uid_t getuid(); \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.h"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.h"
 
   re="int getgid();"
   sbst="gid_t getgid(); \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.h"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Unistd.h"
 
 # --- folly/portability/Fcntl.cpp ---
   re="#include <folly\/portability\/Windows\.h>"
@@ -352,7 +380,7 @@ EOM
 #ifndef __MINGW32__   \/* -- Tebako patched -- *\/
   __try {
 EOM
-  sed -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/folly/net/detail/SocketFileDescriptorMap.cpp"
+  "$GNU_SED" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/folly/net/detail/SocketFileDescriptorMap.cpp"
 
   re="\/\/ We're at the core, we don't get the luxery of SCOPE_EXIT because"
 # shellcheck disable=SC2251
@@ -360,7 +388,7 @@ EOM
 #endif    \/* -- Tebako patched -- *\/
 \/\/ We're at the core, we don't get the luxery of SCOPE_EXIT because
 EOM
-  sed -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/folly/net/detail/SocketFileDescriptorMap.cpp"
+  "$GNU_SED" -i "s/$re/${sbst//$'\n'/"\\n"}/g" "$1/folly/net/detail/SocketFileDescriptorMap.cpp"
 
 # --- folly/portability/Sockets.h ---
   restore_and_save "$1/folly/portability/Sockets.h"
@@ -378,14 +406,14 @@ EOM
 \/* -- End of tebako patch -- *\/
 
 EOM
-  sed -i -i "0,/$re/s||${sbst//$'\n'/"\\n"}|g" "$1/folly/portability/Sockets.h"
+  "$GNU_SED" -i -i "0,/$re/s||${sbst//$'\n'/"\\n"}|g" "$1/folly/portability/Sockets.h"
 
 # --- folly/portability/Time.cpp ---
   funky_time_patch "$1/folly/portability/Time.cpp"
 
   re="(asctime_s(tmpBuf, tm))"
   sbst="(asctime_s(tmpBuf, 64\/* tebako patched *\/, tm))"
-  sed -i "s/$re/$sbst/g" "$1/folly/portability/Time.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/portability/Time.cpp"
 
 # ---
   re="#if (defined(USE_JEMALLOC) || FOLLY_USE_JEMALLOC) && !FOLLY_SANITIZE"
@@ -418,7 +446,7 @@ EOM
 
   re="#if defined(__XROS__)"
   sbst="#if defined(__XROS__) || defined(__MINGW32__) \/* tebako patched *\/"
-  sed -i "s/$re/$sbst/g" "$1/folly/system/ThreadName.cpp"
+  "$GNU_SED" -i "s/$re/$sbst/g" "$1/folly/system/ThreadName.cpp"
 
 # ---
   defined_msc_ver_to_win32 "$1/folly/external/farmhash/farmhash.cpp"

data/tools/ci-scripts/tools.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+# Copyright (c) 2023, [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+set -o errexit -o pipefail -o noclobber -o nounset
+
+: "${LOCAL_BUILDS:=/tmp/local_builds}"
+: "${LOCAL_INSTALLS:=/opt}"
+: "${CMAKE_VERSION:=3.26.5}"
+: "${LIBARCHIVE_VERSION:=3.6.2}"
+: "${ARCH:=linux-x86_64}"
+
+install_cmake() {
+  echo "Running install_cmake version ${CMAKE_VERSION} for ${ARCH}"
+  local cmake_install="${LOCAL_BUILDS}/cmake"
+  mkdir -p "${cmake_install}"
+  pushd "${cmake_install}"
+  wget  "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-${ARCH}.sh"
+  chmod +x "cmake-${CMAKE_VERSION}-${ARCH}.sh"
+  "./cmake-${CMAKE_VERSION}-${ARCH}.sh" --skip-license --prefix=/usr
+  popd
+  rm -rf "${cmake_install}"
+}
+
+build_and_install_libarchive() {
+  echo "Running build_and_install_libarchive version $LIBARCHIVE_VERSION"
+  local libarchive_build="$LOCAL_BUILDS/libarchive"
+  mkdir -p "$libarchive_build"
+  pushd "$libarchive_build"
+  wget "https://github.com/libarchive/libarchive/releases/download/v$LIBARCHIVE_VERSION/libarchive-$LIBARCHIVE_VERSION.tar.xz"
+  tar xf "libarchive-$LIBARCHIVE_VERSION.tar.xz"
+  cd "libarchive-$LIBARCHIVE_VERSION"
+  ./configure --prefix="$LOCAL_INSTALLS" --without-iconv --without-xml2 --without-expat
+  make -j8
+  make install
+  popd
+  rm -rf "$libarchive_build"
+}
+
+# shellcheck disable=SC2068
+$@

data/tools/cmake-scripts/macos-environment.cmake

@@ -24,27 +24,23 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-set(GNU_BASH "bash")
-
 if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
-# If we are cross compiling TARGET_HOMEBREW will point to homebrew environment for target
-# If we are not cross-compiling it will be empty
-# Note that below for Bison, Flex and bash we are using host homebrew environment (just 'brew')
-# while other packages refer target environment potentially specified by BREW_BIN
   execute_process(
     COMMAND brew --prefix
     RESULT_VARIABLE BREW_PREFIX_RES
-    OUTPUT_VARIABLE BUILD_BREW_PREFIX
+    OUTPUT_VARIABLE BREW_PREFIX
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  if(NOT (BREW_PREFIX_RES EQUAL 0 AND EXISTS ${BUILD_BREW_PREFIX}))
+  if(NOT (BREW_PREFIX_RES EQUAL 0 AND EXISTS ${BREW_PREFIX}))
     message(FATAL "Could not find build brew setup")
   endif()
 
-  message("Using build brew environment at ${BUILD_BREW_PREFIX}")
-# https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.me
-  set(BUILD_OPENSSL_ROOT_DIR "${BUILD_BREW_PREFIX}/opt/openssl@1.1")
-  set(BUILD_CMAKE_PREFIX_PATH "${BUILD_BREW_PREFIX}")
+  message(STATUS "Using brew environment at ${BREW_PREFIX}")
+  # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-10.15-Readme.me
+  set(OPENSSL_ROOT_DIR "${BREW_PREFIX}/opt/openssl@3")
+  set(CMAKE_PREFIX_PATH "${BREW_PREFIX}")
+  include_directories("${OPENSSL_ROOT_DIR}/include")
+  include_directories("${TARGET_BREW_PREFIX}/include")
 
   #  https://stackoverflow.com/questions/53877344/cannot-configure-cmake-to-look-for-homebrew-installed-version-of-bison
   execute_process(
@@ -80,25 +76,6 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin")
     set(GNU_BASH "${BREW_BASH_PREFIX}/bin/bash")
   endif()
 
-  if(NOT TARGET_HOMEBREW)
-    set(TARGET_BREW_PREFIX ${BUILD_BREW_PREFIX} )
-  else()
-    execute_process(
-        COMMAND "${TARGET_HOMEBREW}/bin/brew" --prefix
-        RESULT_VARIABLE BREW_PREFIX_RES
-        OUTPUT_VARIABLE TARGET_BREW_PREFIX
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    if(NOT (BREW_PREFIX_RES EQUAL 0 AND EXISTS ${TARGET_BREW_PREFIX}))
-        message(FATAL "Could not find target brew setup")
-    endif()
-  endif()
-
-  message("Using target brew environment at ${TARGET_BREW_PREFIX}")
-  set(OPENSSL_ROOT_DIR "${TARGET_BREW_PREFIX}/opt/openssl@1.1")
-  set(CMAKE_PREFIX_PATH "${TARGET_BREW_PREFIX}")
-  include_directories("${TARGET_BREW_PREFIX}/include")
-
 # Suppress superfluous randlib warnings about "*.a" having no symbols on MacOSX.
   set(CMAKE_C_ARCHIVE_CREATE   "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")
   set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>")

data/tools/cmake-scripts/setup-libarchive.cmake

@@ -0,0 +1,92 @@
+# Copyright (c) 2022-2024 [Ribose Inc](https://www.ribose.com).
+# All rights reserved.
+# This file is a part of tebako
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+def_ext_prj_t(LIBARCHIVE "3.6.2" "9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d")
+
+message(STATUS "Collecting libarchive - " v${LIBARCHIVE_VER} " at " ${LIBARCHIVE_SOURCE_DIR})
+
+set(CMAKE_ARGUMENTS -DCMAKE_INSTALL_PREFIX=${DEPS}
+                    -DCMAKE_BUILD_TYPE=Release
+                    -DBUILD_SHARED_LIBS:BOOL=OFF
+                    -DENABLE_ACL:BOOL=OFF
+                    -DENABLE_CNG:BOOL=OFF
+                    -DENABLE_ICONV:BOOL=OFF
+                    -DENABLE_LIBXML2:BOOL=OFF
+                    -DENABLE_BZip2:BOOL=OFF
+                    -DENABLE_CPIO:BOOL=OFF
+                    -DENABLE_CAT:BOOL=OFF
+                    -DENABLE_TAR:BOOL=OFF
+                    -DENABLE_TEST:BOOL=OFF
+                    -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+                    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+)
+
+if(TEBAKO_BUILD_TARGET)
+  list(APPEND CMAKE_ARGUMENTS  -DCMAKE_C_FLAGS=--target=${TEBAKO_BUILD_TARGET})
+  list(APPEND CMAKE_ARGUMENTS  -DCMAKE_EXE_LINKER_FLAGS=--target=${TEBAKO_BUILD_TARGET})
+  list(APPEND CMAKE_ARGUMENTS  -DCMAKE_SHARED_LINKER_FLAGS=--target=${TEBAKO_BUILD_TARGET})
+endif(TEBAKO_BUILD_TARGET)
+
+  # ...................................................................
+  # libarchive is the module that creates the real pain here
+  # Its shared version looks around to find  other shared libraries which
+  # can do the real work. For example, if liblzma.so is found then libarchive
+  # supports lzma encoding.
+  # Static libary is compiled against predefined set of static archive libraries
+  # at the time when binary distribution created. This is not necessarily the
+  # set of libraries which is present at the system where this script is
+  # executed.
+  #
+  # There are two options to fix it:
+  #
+  #   1) Build local version of libarchive.a
+  #
+  #   2) Use LIBARCHIVE_STATIC_LIBRARIES and LIBARCHIVE_STATIC_LDFLAGS that are
+  #      set by pkg_check_modules(LIBARCHIVE IMPORTED_TARGET libarchive>=3.1.2)
+  #
+  # Method #1 is implemented here.
+  # ...................................................................
+
+if(${IS_MSYS})
+  set(__LIBARCHIVE "${DEPS}/lib/libarchive_static.a")
+else(${IS_MSYS})
+  set(__LIBARCHIVE "${DEPS}/lib/libarchive.a")
+endif(${IS_MSYS})
+
+ExternalProject_Add(${LIBARCHIVE_PRJ}
+  PREFIX "${DEPS}"
+  URL http://www.libarchive.org/downloads/libarchive-${LIBARCHIVE_VER}.tar.xz
+  URL_HASH SHA256=${LIBARCHIVE_HASH}
+  DOWNLOAD_NO_PROGRESS true
+  UPDATE_COMMAND ""
+  CMAKE_ARGS ${CMAKE_ARGUMENTS}
+  SOURCE_DIR ${LIBARCHIVE_SOURCE_DIR}
+  BINARY_DIR ${LIBARCHIVE_BINARY_DIR}
+  BUILD_BYPRODUCTS ${__LIBARCHIVE}
+)
+
+add_library(_LIBARCHIVE STATIC IMPORTED)
+set_target_properties(_LIBARCHIVE PROPERTIES IMPORTED_LOCATION  ${__LIBARCHIVE})
+add_dependencies(_LIBARCHIVE ${LIBARCHIVE_PRJ})