From 2a38bf29618a8ce163f9d6f83b7ae86924752e32 Mon Sep 17 00:00:00 2001 From: cyan Date: Wed, 4 Dec 2024 10:22:48 -0500 Subject: cleanup patches (and other stuff) (#79) * cleanup patches * fix polyseed patch * Fix iOS builds * fix polyseed dependencies * fix polyseed patch for macOS * update ledger patch * update wownero patches and version * update checksums * wip" * update gitmodules * update boost build script * update build_single.sh * vix verbosey_copy * fix __clear_cache bug on wownero * update randomwow * migrate build system * fix cross compilation issues * some more build issue * update polyseed * cleanup cmakelists * fix toolchain.cmake.in * add ssp * another attempt at building windows on CI * fix package name * migrate mirror to my own hosting * change download mirror priority (fallback first) * link ssp in monero module as well by using CMAKE_{C,CXX}_FLAGS * fix android builds * update polyseed source * 13 -> trixie * fix package name conflicts, update runner to sid * update boost to 1_84_0, disable patch that's no longer needed * switch to ubuntu:24.04 * add POLYSEED_STATIC to toolchain.cmake.in in order to properly link * drop patches * fixes to darwin * link missing wowner-seed library * a litte bit more of experiments * build locale only on windows * update iconv * update definitions * update ci builds * update my progress * ios fix, update depends, ci * multithread build system * fix android, mingw and linux build issues * remove dependency check * update Dockerfile to include pigz * show a message when pigz is missing * fix devcontainer mingw setup (missing ENV) * update android build runner * sailfishos dropped (you better go behave yourself and run actual linux programs) * fiz pigz issues * install llvm-ranlib for android * fix iOS build issues * fix dummy ledger patch * fix macos and darwin * fix macos ci * fix macos build command * install autoconf * add automake * add libtool * macos fixes, wownero fixes, idk what else, please help me * fix wownero iOS build * Cleanup patches * add try-catch into monero code * fix error handling * update checksums --- external/macos/build_unbound.sh | 54 ----------------------------------------- external/macos/config.sh | 13 ---------- 2 files changed, 67 deletions(-) delete mode 100755 external/macos/build_unbound.sh delete mode 100755 external/macos/config.sh (limited to 'external/macos') diff --git a/external/macos/build_unbound.sh b/external/macos/build_unbound.sh deleted file mode 100755 index d1c3825..0000000 --- a/external/macos/build_unbound.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -set -x -e - -. config.sh - -#### expat - -EXPAT_VERSION=R_2_4_8 -EXPAT_HASH="3bab6c09bbe8bf42d84b81563ddbcf4cca4be838" -EXPAT_SRC_DIR=${EXTERNAL_MACOS_SOURCE_DIR}/libexpat -rm -rf $EXPAT_SRC_DIR -if [ -d "$EXPAT_SRC_DIR" ]; then - echo "Unbound directory already exists." -else - echo "Cloning Unbound from $Unbound_URL" - mkdir -p ${EXPAT_SRC_DIR} || true - rm -rf ${EXPAT_SRC_DIR} - cp -r "${MONEROC_DIR}/external/libexpat" ${EXPAT_SRC_DIR} -fi -cd $EXPAT_SRC_DIR -cd $EXPAT_SRC_DIR/expat - -./buildconf.sh -./configure --enable-static --disable-shared --prefix=${EXTERNAL_MACOS_DIR} -make -make install - -#### unbound - -UNBOUND_VERSION=release-1.16.2 -UNBOUND_HASH="cbed768b8ff9bfcf11089a5f1699b7e5707f1ea5" -UNBOUND_URL="https://www.nlnetlabs.nl/downloads/unbound/unbound-${UNBOUND_VERSION}.tar.gz" -UNBOUND_DIR_PATH="${EXTERNAL_MACOS_SOURCE_DIR}/unbound-1.16.2" - -echo "============================ Unbound ============================" -rm -rf ${UNBOUND_DIR_PATH} -# Check if the directory already exists. -if [ -d "$UNBOUND_DIR_PATH" ]; then - echo "Unbound directory already exists." -else - echo "Cloning Unbound from $Unbound_URL" - mkdir -p ${UNBOUND_DIR_PATH} || true - rm -rf ${UNBOUND_DIR_PATH} - cp -r "${MONEROC_DIR}/external/unbound" ${UNBOUND_DIR_PATH} -fi -cd $UNBOUND_DIR_PATH -./configure --prefix="${EXTERNAL_MACOS_DIR}" \ - --with-ssl="${HOMEBREW_PREFIX}" \ - --with-libexpat="${EXTERNAL_MACOS_DIR}" \ - --enable-static \ - --disable-shared \ - --disable-flto -make -make install diff --git a/external/macos/config.sh b/external/macos/config.sh deleted file mode 100755 index 3c40625..0000000 --- a/external/macos/config.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -export MACOS_SCRIPTS_DIR="$(pwd)" -export CW_ROOT="${MACOS_SCRIPTS_DIR}" -export EXTERNAL_DIR="${CW_ROOT}/build" -export EXTERNAL_MACOS_DIR="${EXTERNAL_DIR}/MACOS" -export EXTERNAL_MACOS_SOURCE_DIR="${EXTERNAL_MACOS_DIR}/sources" -export EXTERNAL_MACOS_LIB_DIR="${EXTERNAL_MACOS_DIR}/lib" -export EXTERNAL_MACOS_INCLUDE_DIR="${EXTERNAL_MACOS_DIR}/include" -export MONEROC_DIR="$(pwd)/../.." - -mkdir -p "$EXTERNAL_MACOS_LIB_DIR" || true -mkdir -p "$EXTERNAL_MACOS_INCLUDE_DIR" || true \ No newline at end of file -- cgit v1.2.3