summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/android.yml337
-rw-r--r--.woodpecker/linux.yaml38
-rw-r--r--Makefile14
-rw-r--r--build_monero.sh35
-rwxr-xr-xbuild_single.sh72
-rw-r--r--libbridge/CMakeLists.txt89
6 files changed, 187 insertions, 398 deletions
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
deleted file mode 100644
index d654c72..0000000
--- a/.github/workflows/android.yml
+++ /dev/null
@@ -1,337 +0,0 @@
-name: Android Release
-run-name: Building monero_c for android
-on:
- push:
- tags:
- - '*'
-
-# cat envs.txt | sed 's/ //g' | sed 's/: /=/g' | grep -v '#' > .env
-# export $(cat .env | xargs)
-env:
- WORKDIR: /opt/android
- ANDROID_SDK_ROOT: /opt/android/tools
- ANDROID_NDK_ROOT: /opt/android/android-ndk-r17c
- PREFIX: /opt/android/prefix
- TOOLCHAIN_DIR: /opt/android/toolchain
- NPROC: 4
- CLEAN_PATH: /usr/cmake-3.14.6-Linux-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
- PATH: /usr/cmake-3.14.6-Linux-x86_64/bin:/opt/android/toolchain/${{ matrix.host_triplet }}/bin:/opt/android/toolchain/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
- # CMake
- CMAKE_VERSION: '3.14.6'
- CMAKE_HASH: '82e08e50ba921035efa82b859c74c5fbe27d3e49a4003020e3c77618a4e912cd'
- # Boost
- BOOST_VERSION: '1_70_0'
- BOOST_VERSION_DOT: '1.70.0'
- BOOST_HASH: '430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778'
- # iconv
- ICONV_VERSION: '1.16'
- ICONV_HASH: 'e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04'
- # zlib
- ZLIB_VERSION: '1.3.1'
- ZLIB_HASH: '9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23'
- # OpenSSL
- OPENSSL_VERSION: '3.0.5'
- OPENSSL_HASH: 'aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a'
- # ZMQ
- ZMQ_VERSION: 'v4.3.2'
- ZMQ_HASH: 'a84ffa12b2eb3569ced199660bac5ad128bff1f0'
- # libsodium
- SODIUM_VERSION: '1.0.18'
- SODIUM_HASH: '4f5e89fa84ce1d178a6765b8b46f2b6f91216677'
- # libexpat
- LIBEXPAT_VERSION: 'R_2_4_8'
- LIBEXPAT_HASH: '3bab6c09bbe8bf42d84b81563ddbcf4cca4be838'
- # libunbound
- LIBUNBOUND_VERSION: 'branch-1.16.1'
- LIBUNBOUND_HASH: '903538c76e1d8eb30d0814bb55c3ef1ea28164e8'
- # polyseed
- POLYSEED_HASH: 'b7c35bb3c6b91e481ecb04fc235eaff69c507fa1'
- # utf8proc
- UTF8PROC_HASH: '1cb28a66ca79a0845e99433fd1056257456cef8b'
- # (finally) monero
- MONERO_GIT_SOURCE_SIMPLE: 'git.mrcyjanek.net_mrcyjanek_monero'
- MONERO_GIT_SOURCE: https://git.mrcyjanek.net/mrcyjanek/monero.git
- MONERO_TAG: 'release-v0.18.3.1-anonero'
-
-
-jobs:
- build-android:
- strategy:
- matrix:
- include:
- - short_arch: arm64
- full_arch: arm64-v8a
- monero_arch: armv8-a
- monero_buildtag: android-armv8
- monero_build64: 'ON'
- monero_cmake_arm_mode: 'OFF'
- host_triplet: aarch64-linux-android
- - short_arch: arm
- full_arch: armeabi-v7a
- monero_arch: armv7-a
- monero_buildtag: android-armv7
- monero_build64: 'OFF'
- monero_cmake_arm_mode: 'ON'
- host_triplet: arm-linux-androideabi
- - short_arch: x86_64
- full_arch: x86_64
- monero_arch: x86-64
- monero_buildtag: android-x86_64
- monero_build64: 'ON'
- monero_cmake_arm_mode: 'OFF'
- host_triplet: x86_64-linux-android
- - short_arch: x86
- full_arch: x86
- monero_arch: i686
- monero_buildtag: android-x86
- monero_build64: 'OFF'
- monero_cmake_arm_mode: 'OFF'
- host_triplet: i686-linux-android
- runs-on: androidndk-r17c
- steps:
- - name: Checkout repository code
- uses: actions/checkout@v3
- - name: Download monero
- run: |
- cd ${{ github.workspace }} \
- && rm -rf monero && git clone ${MONERO_GIT_SOURCE} --depth=1 --branch ${MONERO_TAG} monero \
- && cd monero \
- && git submodule init && git submodule update
- - name: Install CMake
- run: |
- cd ${{ github.workspace }} \
- && cd /usr \
- && curl -L -O https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz \
- && echo "${CMAKE_HASH} cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" | sha256sum -c \
- && tar -xzf /usr/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz \
- && rm -f /usr/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz
- - name: Download Boost
- run: |
- cd ${{ github.workspace }} \
- && curl -L -o boost_${BOOST_VERSION}.tar.bz2 https://archives.boost.io/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
- && echo "${BOOST_HASH} boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
- && tar -xf boost_${BOOST_VERSION}.tar.bz2 \
- && rm -f boost_${BOOST_VERSION}.tar.bz2
- - name: Download iconv
- run: |
- cd ${{ github.workspace }} \
- && curl -O http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz \
- && echo "${ICONV_HASH} libiconv-${ICONV_VERSION}.tar.gz" | sha256sum -c \
- && tar -xzf libiconv-${ICONV_VERSION}.tar.gz \
- && rm -f libiconv-${ICONV_VERSION}.tar.gz
- - name: Download zlib
- run: |
- cd ${{ github.workspace }} \
- && curl -O https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
- && echo "${ZLIB_HASH} zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \
- && tar -xzf zlib-${ZLIB_VERSION}.tar.gz \
- && rm zlib-${ZLIB_VERSION}.tar.gz \
- && mv zlib-${ZLIB_VERSION} zlib
- - name: Download OpenSSL
- run: |
- cd ${{ github.workspace }} \
- && curl -O https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
- && echo "${OPENSSL_HASH} openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c \
- && tar -xzf openssl-${OPENSSL_VERSION}.tar.gz \
- && rm openssl-${OPENSSL_VERSION}.tar.gz
- - name: Download ZMQ
- run: |
- cd ${{ github.workspace }} \
- && git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} --depth=1 \
- && cd libzmq \
- && test `git rev-parse HEAD` = ${ZMQ_HASH} || exit 1
- - name: Download libsodium
- run: |
- cd ${{ github.workspace }} \
- && git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} --depth=1 \
- && cd libsodium \
- && test `git rev-parse HEAD` = ${SODIUM_HASH} || exit 1
- - name: Download libexpat
- run: |
- cd ${{ github.workspace }} \
- && git clone https://github.com/libexpat/libexpat.git -b ${LIBEXPAT_VERSION} --depth=1 \
- && cd libexpat/expat \
- && test `git rev-parse HEAD` = ${LIBEXPAT_HASH} || exit 1 \
- - name: Download libunbound
- run: |
- cd ${{ github.workspace }} \
- && git clone https://github.com/NLnetLabs/unbound.git -b ${LIBUNBOUND_VERSION} --depth=1 \
- && cd unbound \
- && test `git rev-parse HEAD` = ${LIBUNBOUND_HASH} || exit 1
- - name: Download polyseed
- run: |
- cd ${{ github.workspace }} \
- && git clone https://github.com/tevador/polyseed.git \
- && cd polyseed \
- && git reset --hard ${POLYSEED_HASH}
- - name: Download utf8proc
- run: |
- cd ${{ github.workspace }} \
- && git clone https://github.com/JuliaStrings/utf8proc -b v2.8.0 --depth=1 \
- && cd utf8proc \
- && git reset --hard ${UTF8PROC_HASH}
- - name: Make standalone toolchain
- run: |
- cd ${{ github.workspace }} \
- && ${ANDROID_NDK_ROOT}/build/tools/make_standalone_toolchain.py --arch ${{ matrix.short_arch }} --api 21 --install-dir ${TOOLCHAIN_DIR} --stl=libc++
- - name: Build boost (1/2)
- run: |
- [[ -f "/tmp/skip_deps" ]] && exit 0; \
- cd ${{ github.workspace }} \
- && cd boost_${BOOST_VERSION} \
- && PATH=$CLEAN_PATH ./bootstrap.sh --prefix=${PREFIX}
- # iconv: libtool: warning: remember to run 'libtool --finish /opt/android/prefix/lib'
- # TODO(mrcyjanek): x86_64-linux-gnu <- get this dynamically.
- - name: Build iconv (for boost)
- run: |
- cd ${{ github.workspace }} \
- && cd libiconv-${ICONV_VERSION} \
- && CC=clang CXX=clang++ ./configure --build=x86_64-linux-gnu --host=${{ matrix.host_triplet }} --prefix=${PREFIX} --disable-rpath \
- && make -j${NPROC} \
- && make install
- - name: Build boost (2/2)
- run: |
- cd ${{ github.workspace }} \
- && cd boost_${BOOST_VERSION} \
- && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} install -j${NPROC} &>/tmp/boost_log.txt || cat /tmp/boost_log.txt
- - name: Build zlib
- run: |
- cd ${{ github.workspace }} \
- && cd zlib \
- && CC=clang CXX=clang++ ./configure --static \
- && make -j${NPROC}
- - name: Build OpenSSL
- run: |
- cd ${{ github.workspace }} \
- && cd openssl-${OPENSSL_VERSION} \
- && export PATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \
- && ./Configure android-${{ matrix.short_arch }} -D__ANDROID_API__=21 -static no-shared no-tests --with-zlib-include=${WORKDIR}/zlib/include --with-zlib-lib=${WORKDIR}/zlib/lib --prefix=${PREFIX} --openssldir=${PREFIX} \
- && make -j${NPROC} &>/tmp/openssl_log.txt || cat /tmp/openssl_log.txt \
- && make install_sw &>/tmp/openssl_log_2.txt || cat /tmp/openssl_log_2.txt
- - name: Build OpenSSL (alt)
- run: |
- cd ${{ github.workspace }} \
- && cd openssl-${OPENSSL_VERSION} \
- && export PATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \
- && ./Configure android-${{ matrix.short_arch }} -D__ANDROID_API__=21 -static no-shared no-tests --with-zlib-include=${WORKDIR}/zlib/include --with-zlib-lib=${WORKDIR}/zlib/lib --prefix=${PREFIX}/openssl --openssldir=${PREFIX}/openssl \
- && make -j${NPROC} &>/tmp/openssl_log.txt || cat /tmp/openssl_log.txt \
- && make install_sw &>/tmp/openssl_log_2.txt || cat /tmp/openssl_log_2.txt
- - name: Build ZMQ
- run: |
- cd ${{ github.workspace }} \
- && cd libzmq \
- && ./autogen.sh \
- && CC=clang CXX=clang++ ./configure --prefix=${PREFIX} --host=${{ matrix.host_triplet }} --enable-static --disable-shared \
- && make -j${NPROC} \
- && make install
- - name: Build Sodium
- run: |
- cd ${{ github.workspace }} \
- && cd libsodium \
- && ./autogen.sh \
- && CC=clang CXX=clang++ ./configure --prefix=${PREFIX} --host=${{ matrix.host_triplet }} --enable-static --disable-shared \
- && make -j${NPROC} \
- && make install
- - name: Build libexpat
- run: |
- cd ${{ github.workspace }} \
- && cd libexpat/expat \
- && ./buildconf.sh \
- && CC=clang CXX=clang++ ./configure --prefix=${PREFIX} --host=${{ matrix.host_triplet }} --enable-static --disable-shared \
- && make -j${NPROC} \
- && make install
- - name: Build libunbound
- run: |
- cd ${{ github.workspace }} \
- && cd unbound \
- && CC=clang CXX=clang++ ./configure --prefix=${PREFIX} --host=${{ matrix.host_triplet }} --enable-static --disable-shared --disable-flto --with-ssl=${PREFIX} --with-libexpat=${PREFIX} \
- && make -j${NPROC} \
- && make install
- - name: Build polyseed
- run: |
- cd ${{ github.workspace }} \
- && cd polyseed \
- && CC=clang CXX=clang++ cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} . \
- && make -j${NPROC} \
- && make install
- - name: Build utf8proc
- run: |
- cd ${{ github.workspace }} \
- && cd utf8proc \
- && mkdir build \
- && cd build \
- && rm -rf ../CMakeCache.txt ../CMakeFiles/ \
- && CC=clang CXX=clang++ cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} .. \
- && make -j${NPROC} \
- && make install
- - name: Build monero (1/2) configure
- run: |
- cd ${{ github.workspace }} \
- && cd monero \
- && export CMAKE_INCLUDE_PATH="${PREFIX}/include" \
- CMAKE_LIBRARY_PATH="${PREFIX}/lib" \
- ANDROID_STANDALONE_TOOLCHAIN_PATH=${TOOLCHAIN_DIR} \
- USE_SINGLE_BUILDDIR=1 \
- PATH=${CLEAN_PATH} \
- && mkdir -p build/release \
- && cd build/release \
- && if [[ "x${{ matrix.monero_cmake_arm_mode }}" == "xON" ]]; then echo xON \
- && env CC=clang CXX=clang++ cmake -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH="${{ matrix.monero_arch }}" -D STATIC=ON -D BUILD_64="${{ matrix.monero_build64 }}" -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D BUILD_TAG="${{ matrix.monero_buildtag }}" -D CMAKE_SYSTEM_NAME="Android" -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${ANDROID_STANDALONE_TOOLCHAIN_PATH}" -D CMAKE_ANDROID_ARM_MODE="ON" -D CMAKE_ANDROID_ARCH_ABI="${{ matrix.full_arch }}" ../.. ; else echo xONelse \
- && env CC=clang CXX=clang++ cmake -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH="${{ matrix.monero_arch }}" -D STATIC=ON -D BUILD_64="${{ matrix.monero_build64 }}" -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D BUILD_TAG="${{ matrix.monero_buildtag }}" -D CMAKE_SYSTEM_NAME="Android" -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${ANDROID_STANDALONE_TOOLCHAIN_PATH}" -D CMAKE_ANDROID_ARCH_ABI="${{ matrix.full_arch }}" ../.. ; fi
- - name: Build monero (2/2) build
- run: |
- cd ${{ github.workspace }} \
- && cd monero \
- && cd build/release \
- && export CMAKE_INCLUDE_PATH="${PREFIX}/include" \
- && export CMAKE_LIBRARY_PATH="${PREFIX}/lib" \
- && export ANDROID_STANDALONE_TOOLCHAIN_PATH=${TOOLCHAIN_DIR} \
- && export USE_SINGLE_BUILDDIR=1 \
- && export PATH=${CLEAN_PATH} \
- && make wallet_api -j${NPROC}
- - name: Copy prefix from $PREFIX to local
- run: |
- cd ${{ github.workspace }} \
- && cp -a /opt/android/prefix ${{ github.workspace }}/prefix
- - name: Build libbridge (1/2) configure
- run: |
- cd ${{ github.workspace }} \
- && cd libbridge \
- && mkdir build \
- && cd build \
- && env CC=clang CXX=clang++ cmake -DANDROID_ABI=${{ matrix.full_arch }} ..
- - name: Build libbridge (2/2) make
- run: |
- cd ${{ github.workspace }} \
- && make host_copy_libs \
- && cd libbridge \
- && cd build \
- && make -j${NPROC}
- - name: Rename and compress libwallet2_api_c.so
- run: |
- cd ${{ github.workspace }}/libbridge/build/ \
- && mv libwallet2_api_c.so ${{ matrix.host_triplet }}_libwallet2_api_c.so \
- && sha256sum ${{ matrix.host_triplet }}_libwallet2_api_c.so > ${{ matrix.host_triplet }}_libwallet2_api_c.so.sha256 \
- && xz -e ${{ matrix.host_triplet }}_libwallet2_api_c.so \
- && sha256sum ${{ matrix.host_triplet }}_libwallet2_api_c.so.xz > ${{ matrix.host_triplet }}_libwallet2_api_c.so.xz.sha256
- # - name: act - copy workspace to /opt/wspace
- # if: ${{ env.ACT }}
- # run: cp -a ${{ github.workspace }} /opt/wspace
- - name: Create release
- uses: https://gitea.com/akkuman/gitea-release-action@v1
- with:
- body: |
- This is a **preview** release to be used by testers.
- It was built from **${{ github.ref }}** commit `${{ github.sha }}`
- Grab corresponding [wallet2_api_c.h](https://git.mrcyjanek.net/mrcyjanek/monero_c/src/commit/${{ github.sha }}/libbridge/src/main/cpp/wallet2_api_c.h)
- ### Important
-
- CI is in process of migrating to [static.mrcyjanek.net](https://static.mrcyjanek.net/monero_c/) for repository store.
-
- ### Release info
- ${{ github.event.head_commit.message }}
- files: |-
- ${{ github.workspace }}/libbridge/build/${{ matrix.host_triplet }}_libwallet2_api_c.so.xz
- ${{ github.workspace }}/libbridge/build/${{ matrix.host_triplet }}_libwallet2_api_c.so.sha256
- ${{ github.workspace }}/libbridge/build/${{ matrix.host_triplet }}_libwallet2_api_c.so.xz.sha256 \ No newline at end of file
diff --git a/.woodpecker/linux.yaml b/.woodpecker/linux.yaml
index 45a4add..f874610 100644
--- a/.woodpecker/linux.yaml
+++ b/.woodpecker/linux.yaml
@@ -5,14 +5,16 @@ clone:
partial: false
matrix:
include:
- - image: git.mrcyjanek.net/mrcyjanek/debian:bookworm
- platform: linux/amd64
- make_steps: depends_host monero_linux_amd64 moneroc_linux_host64
- prepare_cmd: echo ok
- prepare_cmd_depends: echo ok
- triplet: x86_64-linux-gnu
- cc: clang
- cxx: clang++
+ # - image: git.mrcyjanek.net/mrcyjanek/debian:bookworm
+ # platform: linux/amd64
+ # make_steps: depends_host monero_linux_amd64 moneroc_linux_host64
+ # prepare_cmd: echo ok
+ # prepare_cmd_depends: echo ok
+ # triplet: x86_64-linux-gnu
+ # cc: clang
+ # cxx: clang++
+ # host:
+ # boost_toolset: clang
- image: git.mrcyjanek.net/mrcyjanek/debian:bookworm
platform: linux/aarch64
make_steps: depends_host monero_linux_arm64 moneroc_linux_host64
@@ -21,6 +23,8 @@ matrix:
triplet: aarch64-linux-gnu
cc: clang
cxx: clang++
+ host:
+ boost_toolset: clang
- image: alpine:3.19.1
platform: linux/amd64
make_steps: alpine_fix_libexecinfo depends_host monero_linux_amd64 moneroc_linux_host64
@@ -29,6 +33,8 @@ matrix:
triplet: x86_64-alpine-linux-musl
cc: gcc
cxx: g++
+ host:
+ boost_toolset: gcc
# - image: alpine:3.19.1
# platform: linux/aarch64
# make_steps: alpine_fix_libexecinfo depends_host monero_linux_arm64 moneroc_linux_host64
@@ -45,7 +51,19 @@ matrix:
triplet: aarch64-linux-sailfishos
cc: clang
cxx: clang++
-
+ host:
+ boost_toolset: clang
+ - image: git.mrcyjanek.net/mrcyjanek/osxcross:14_bookworm
+ platform: linux/amd64
+ make_steps: depends_host monero_linux_arm64 moneroc_linux_host64
+ prepare_cmd: echo ok
+ prepare_cmd_depends: echo ok
+ triplet: x86_64-apple-darwin23
+ cc: x86_64-apple-darwin23-clang
+ cxx: x86_64-apple-darwin23-clang++
+ host: x86_64-apple-darwin23
+ boost_toolset: clang
+ openssl_target: darwin64-x86_64
labels:
platform: ${platform}
@@ -60,7 +78,7 @@ steps:
commands:
- ${prepare_cmd}
- ${prepare_cmd_depends}
- - CC=${cc} CXX=${cxx} make ${make_steps}
+ - CC=${cc} CXX=${cxx} HOST=${host} BOOST_TOOLSET=${boost_toolset} OPENSSL_TARGET=${openssl_target} make ${make_steps}
- name: info
image: git.mrcyjanek.net/mrcyjanek/debian:bookworm
commands:
diff --git a/Makefile b/Makefile
index 5fa37cc..7dee8d4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ export $(shell sed 's/=.*//' .env)
CC ?= clang
CXX ?= clang++
-HOST ?= $(shell gcc -dumpmachin)
+HOST ?= $(shell gcc -dumpmachine)
PREFIX := ${PWD}/prefix
@@ -89,7 +89,7 @@ host_move_libs:
.PHONY: libiconv_host
libiconv_host:
- cd libiconv-${ICONV_VERSION} && ./configure --prefix=${PREFIX} --disable-rpath
+ cd libiconv-${ICONV_VERSION} && ./configure --prefix=${PREFIX} --host=${HOST} --disable-rpath
cd libiconv-${ICONV_VERSION} && make -j${NPROC}
cd libiconv-${ICONV_VERSION} && make install
@@ -99,23 +99,23 @@ boost_host:
cd boost_${BOOST_VERSION} && echo '#define PTHREAD_STACK_MIN 16384' | cat - ./boost/thread/pthread/thread_data.hpp > temp && mv temp ./boost/thread/pthread/thread_data.hpp
cd boost_${BOOST_VERSION} && echo '#undef PTHREAD_STACK_MIN'| cat - ./boost/thread/pthread/thread_data.hpp > temp && mv temp ./boost/thread/pthread/thread_data.hpp
cd boost_${BOOST_VERSION} && echo '' | cat - ./boost/thread/pthread/thread_data.hpp > temp && mv temp ./boost/thread/pthread/thread_data.hpp
- cd boost_${BOOST_VERSION} && ./bootstrap.sh --prefix=${PREFIX} --with-toolset=${CC}
- cd boost_${BOOST_VERSION} && ./b2 cxxflags=-fPIC cflags=-fPIC --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=linux --stagedir=linux toolset=${CC} threading=multi threadapi=pthread -sICONV_PATH=${PREFIX} install -j${NPROC}
+ cd boost_${BOOST_VERSION} && ./bootstrap.sh --prefix=${PREFIX} --with-toolset=${BOOST_TOOLSET}
+ cd boost_${BOOST_VERSION} && ./b2 cxxflags=-fPIC cflags=-fPIC --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=linux --stagedir=linux toolset=${BOOST_TOOLSET} threading=multi threadapi=pthread -sICONV_PATH=${PREFIX} install -j${NPROC}
.PHONY: zlib_host
zlib_host:
- cd zlib && ./configure --static
+ cd zlib && ./configure --static --prefix=${PREFIX}
cd zlib && make -j${NPROC}
.PHONY: openssl_host
openssl_host:
- cd openssl-${OPENSSL_VERSION} && env PATH="${PREFIX}/perl/bin/:${PATH}" ./Configure -static no-shared no-tests --with-zlib-include=${PREFIX}/zlib/include --with-zlib-lib=${PREFIX}/zlib/lib --prefix=${PREFIX} --openssldir=${PREFIX} -fPIC
+ cd openssl-${OPENSSL_VERSION} && env PATH="${PREFIX}/perl/bin/:${PATH}" ./Configure ${OPENSSL_TARGET} -static no-shared no-tests --with-zlib-include=${PREFIX}/zlib/include --with-zlib-lib=${PREFIX}/zlib/lib --prefix=${PREFIX} --openssldir=${PREFIX} -fPIC
cd openssl-${OPENSSL_VERSION} && make -j${NPROC}
cd openssl-${OPENSSL_VERSION} && make install_sw
.PHONY: openssl_host_alt
openssl_host_alt:
- cd openssl-${OPENSSL_VERSION} && env PATH="${PREFIX}/perl/bin/:${PATH}" ./Configure -static no-shared no-tests --with-zlib-include=${PREFIX}/zlib/include --with-zlib-lib=${PREFIX}/zlib/lib --prefix=${PREFIX}/openssl --openssldir=${PREFIX}/openssl -fPIC
+ cd openssl-${OPENSSL_VERSION} && env PATH="${PREFIX}/perl/bin/:${PATH}" ./Configure ${OPENSSL_TARGET} -static no-shared no-tests --with-zlib-include=${PREFIX}/zlib/include --with-zlib-lib=${PREFIX}/zlib/lib --prefix=${PREFIX}/openssl --openssldir=${PREFIX}/openssl -fPIC
cd openssl-${OPENSSL_VERSION} && make -j${NPROC}
cd openssl-${OPENSSL_VERSION} && make install_sw
diff --git a/build_monero.sh b/build_monero.sh
new file mode 100644
index 0000000..b7776bc
--- /dev/null
+++ b/build_monero.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# monero_c build instructions for linux
+
+# linux targets
+x86_64-linux-gnu
+i686-linux-gnu
+aarch64-linux-gnu
+
+# apple
+x86_64-apple-darwin11
+aarch64-apple-darwin11
+
+# Android
+x86_64-linux-android
+i686-linux-android
+aarch64-linux-android
+armv7a-linux-androideabi
+
+# windows
+# update-alternatives --set x86_64-w64-mingw32-g++ x86_64-w64-mingw32-g++-posix
+# update-alternatives --set x86_64-w64-mingw32-gcc x86_64-w64-mingw32-gcc-posix
+x86_64-w64-mingw32
+i686-w64-mingw32
+
+
+ # - image: git.mrcyjanek.net/mrcyjanek/debian:bookworm
+ # platform: linux/amd64
+ # make_steps: depends_host monero_linux_amd64 moneroc_linux_host64
+ # prepare_cmd: echo ok
+ # prepare_cmd_depends: echo ok
+ # triplet: x86_64-linux-gnu
+ # cc: clang
+ # cxx: clang++
+ # host:
+ # boost_toolset: clang \ No newline at end of file
diff --git a/build_single.sh b/build_single.sh
new file mode 100755
index 0000000..653b07d
--- /dev/null
+++ b/build_single.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+set -e
+
+HOST_ABI="$1"
+if [[ "x$HOST_ABI" == "x" ]];
+then
+ echo "Usage: $0 $(gcc -dumpmachine) -j$(nproc)"
+ exit 1
+fi
+
+NPROC="$2"
+
+if [[ "x$NPROC" == "x" ]];
+then
+ echo "Usage: $0 $(gcc -dumpmachine) -j$(nproc)"
+ exit 1
+fi
+
+CC=""
+CXX=""
+case "$HOST_ABI" in
+ "x86_64-linux-gnu")
+ export CC="x86_64-linux-gnu-gcc"
+ export CC="x86_64-linux-gnu-g++"
+ ;;
+ "i686-linux-gnu")
+ export CC="i686-linux-gnu-gcc"
+ export CXX="i686-linux-gnu-g++"
+ ;;
+ "aarch64-linux-gnu")
+ export CC="aarch64-linux-gnu-gcc"
+ export CXX="aarch64-linux-gnu-g++"
+ ;;
+esac
+
+if [[ "x$CC" == "x" ]];
+then
+ echo "No C compiler found for abi: '$HOST_ABI'. Adjust the switch case in $0"
+ exit 1
+fi
+
+if [[ "x$CXX" == "x" ]];
+then
+ echo "No C++ compiler found for abi: '$HOST_ABI'. Adjust the switch case in $0"
+ exit 1
+fi
+
+cd $(dirname $0)
+pushd monero/contrib/depends
+ make HOST="$HOST_ABI" "$NPROC"
+popd
+
+rm -rf monero/build/${HOST_ABI} 2>/dev/null || true
+mkdir -p monero/build/${HOST_ABI}
+pushd monero/build/${HOST_ABI}
+ env CC=${CC} CXX=${CXX} cmake -DCMAKE_TOOLCHAIN_FILE=$PWD/../../contrib/depends/${HOST_ABI}/share/toolchain.cmake ../..
+ env CC=${CC} CXX=${CXX} make wallet_api $NPROC
+popd
+pushd libbridge
+ rm -rf build/${HOST_ABI} || true
+ mkdir -p build/${HOST_ABI} -p
+ cd build/${HOST_ABI}
+
+ env CC=${CC} CXX=${CXX} cmake -DHOST_ABI=${HOST_ABI} ../..
+ env CC=${CC} CXX=${CXX} make $NPROC
+popd
+
+mkdir release 2>/dev/null || true
+pushd release
+ xz -e ../libbridge/build/${HOST_ABI}/libwallet2_api_c.so
+ mv ../libbridge/build/${HOST_ABI}/libwallet2_api_c.so.xz ${HOST_ABI}_libwallet2_api_c.so.xz
+popd \ No newline at end of file
diff --git a/libbridge/CMakeLists.txt b/libbridge/CMakeLists.txt
index 02fa908..e340bef 100644
--- a/libbridge/CMakeLists.txt
+++ b/libbridge/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.4.1)
project(wallet2_api_c)
-message(STATUS ABI_INFO = ${ANDROID_ABI})
+message(STATUS ABI_INFO = ${HOST_ABI})
set (CMAKE_CXX_STANDARD 11)
@@ -9,7 +9,8 @@ add_library( wallet2_api_c
src/main/cpp/helpers.cpp
src/main/cpp/wallet2_api_c.cpp )
-set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/..)
+set(MONERO_DIR ${CMAKE_SOURCE_DIR}/../monero)
+set(EXTERNAL_LIBS_DIR ${MONERO_DIR}/contrib/depends/${HOST_ABI})
############
# libsodium
@@ -17,7 +18,7 @@ set(EXTERNAL_LIBS_DIR ${CMAKE_SOURCE_DIR}/..)
add_library(sodium STATIC IMPORTED)
set_target_properties(sodium PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libsodium.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libsodium.a)
############
# OpenSSL
@@ -25,11 +26,11 @@ set_target_properties(sodium PROPERTIES IMPORTED_LOCATION
add_library(crypto STATIC IMPORTED)
set_target_properties(crypto PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/openssl/lib/libcrypto.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libcrypto.a)
add_library(ssl STATIC IMPORTED)
set_target_properties(ssl PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/openssl/lib/libssl.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libssl.a)
############
# Boost
@@ -37,39 +38,39 @@ set_target_properties(ssl PROPERTIES IMPORTED_LOCATION
add_library(boost_chrono STATIC IMPORTED)
set_target_properties(boost_chrono PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libboost_chrono.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libboost_chrono-mt-d.a)
add_library(boost_date_time STATIC IMPORTED)
set_target_properties(boost_date_time PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libboost_date_time.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libboost_date_time-mt.a)
add_library(boost_filesystem STATIC IMPORTED)
set_target_properties(boost_filesystem PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libboost_filesystem.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libboost_filesystem-mt.a)
add_library(boost_program_options STATIC IMPORTED)
set_target_properties(boost_program_options PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libboost_program_options.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libboost_program_options-mt.a)
add_library(boost_regex STATIC IMPORTED)
set_target_properties(boost_regex PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libboost_regex.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libboost_regex-mt.a)
add_library(boost_serialization STATIC IMPORTED)
set_target_properties(boost_serialization PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libboost_serialization.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libboost_serialization-mt.a)
add_library(boost_system STATIC IMPORTED)
set_target_properties(boost_system PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libboost_system.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libboost_system-mt.a)
add_library(boost_thread STATIC IMPORTED)
set_target_properties(boost_thread PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libboost_thread.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libboost_thread-mt.a)
add_library(boost_wserialization STATIC IMPORTED)
set_target_properties(boost_wserialization PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libboost_wserialization.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libboost_wserialization-mt.a)
#############
# Polyseed
@@ -77,11 +78,11 @@ set_target_properties(boost_wserialization PROPERTIES IMPORTED_LOCATION
add_library(polyseed STATIC IMPORTED)
set_target_properties(polyseed PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libpolyseed.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libpolyseed.a)
add_library(polyseed-wrapper STATIC IMPORTED)
set_target_properties(polyseed-wrapper PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/polyseed/libpolyseed_wrapper.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/polyseed/libpolyseed_wrapper.a)
#############
# Utf8proc
@@ -89,7 +90,7 @@ set_target_properties(polyseed-wrapper PROPERTIES IMPORTED_LOCATION
add_library(utf8proc STATIC IMPORTED)
set_target_properties(utf8proc PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libutf8proc.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/external/utf8proc/libutf8proc.a)
#############
# Monero
@@ -97,108 +98,108 @@ set_target_properties(utf8proc PROPERTIES IMPORTED_LOCATION
add_library(wallet_api STATIC IMPORTED)
set_target_properties(wallet_api PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/lib/libwallet_api.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/lib/libwallet_api.a)
add_library(wallet STATIC IMPORTED)
set_target_properties(wallet PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/lib/libwallet.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/lib/libwallet.a)
add_library(cryptonote_core STATIC IMPORTED)
set_target_properties(cryptonote_core PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/cryptonote_core/libcryptonote_core.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/cryptonote_core/libcryptonote_core.a)
add_library(cryptonote_basic STATIC IMPORTED)
set_target_properties(cryptonote_basic PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/cryptonote_basic/libcryptonote_basic.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/cryptonote_basic/libcryptonote_basic.a)
add_library(mnemonics STATIC IMPORTED)
set_target_properties(mnemonics PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/mnemonics/libmnemonics.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/mnemonics/libmnemonics.a)
add_library(common STATIC IMPORTED)
set_target_properties(common PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/common/libcommon.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/common/libcommon.a)
add_library(cncrypto STATIC IMPORTED)
set_target_properties(cncrypto PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/crypto/libcncrypto.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/crypto/libcncrypto.a)
add_library(ringct STATIC IMPORTED)
set_target_properties(ringct PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/ringct/libringct.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/ringct/libringct.a)
add_library(ringct_basic STATIC IMPORTED)
set_target_properties(ringct_basic PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/ringct/libringct_basic.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/ringct/libringct_basic.a)
add_library(blockchain_db STATIC IMPORTED)
set_target_properties(blockchain_db PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/blockchain_db/libblockchain_db.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/blockchain_db/libblockchain_db.a)
add_library(lmdb STATIC IMPORTED)
set_target_properties(lmdb PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/external/db_drivers/liblmdb/liblmdb.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/external/db_drivers/liblmdb/liblmdb.a)
add_library(easylogging STATIC IMPORTED)
set_target_properties(easylogging PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/external/easylogging++/libeasylogging.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/external/easylogging++/libeasylogging.a)
add_library(unbound STATIC IMPORTED)
set_target_properties(unbound PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/prefix/lib/libunbound.a)
+ ${EXTERNAL_LIBS_DIR}/lib/libunbound.a)
add_library(epee STATIC IMPORTED)
set_target_properties(epee PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/contrib/epee/src/libepee.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/contrib/epee/src/libepee.a)
add_library(blocks STATIC IMPORTED)
set_target_properties(blocks PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/blocks/libblocks.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/blocks/libblocks.a)
add_library(checkpoints STATIC IMPORTED)
set_target_properties(checkpoints PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/checkpoints/libcheckpoints.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/checkpoints/libcheckpoints.a)
add_library(device STATIC IMPORTED)
set_target_properties(device PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/device/libdevice.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/device/libdevice.a)
add_library(device_trezor STATIC IMPORTED)
set_target_properties(device_trezor PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/device_trezor/libdevice_trezor.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/device_trezor/libdevice_trezor.a)
add_library(multisig STATIC IMPORTED)
set_target_properties(multisig PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/multisig/libmultisig.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/multisig/libmultisig.a)
add_library(version STATIC IMPORTED)
set_target_properties(version PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/libversion.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/libversion.a)
add_library(net STATIC IMPORTED)
set_target_properties(net PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/net/libnet.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/net/libnet.a)
add_library(hardforks STATIC IMPORTED)
set_target_properties(hardforks PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/hardforks/libhardforks.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/hardforks/libhardforks.a)
add_library(randomx STATIC IMPORTED)
set_target_properties(randomx PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/external/randomx/librandomx.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/external/randomx/librandomx.a)
add_library(rpc_base STATIC IMPORTED)
set_target_properties(rpc_base PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/rpc/librpc_base.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/rpc/librpc_base.a)
# TODO(mrcyjanek): fix (x86_64 maybe?)
add_library(wallet-crypto STATIC IMPORTED)
set_target_properties(wallet-crypto PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/crypto/wallet/libwallet-crypto.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/crypto/wallet/libwallet-crypto.a)
add_library(cryptonote_format_utils_basic STATIC IMPORTED)
set_target_properties(cryptonote_format_utils_basic PROPERTIES IMPORTED_LOCATION
- ${EXTERNAL_LIBS_DIR}/monero/build/release/src/cryptonote_basic/libcryptonote_format_utils_basic.a)
+ ${MONERO_DIR}/build/${HOST_ABI}/src/cryptonote_basic/libcryptonote_format_utils_basic.a)
#############
# System
@@ -210,7 +211,7 @@ include_directories( ${EXTERNAL_LIBS_DIR}/include )
message(STATUS EXTERNAL_LIBS_DIR : ${EXTERNAL_LIBS_DIR})
-if(${ANDROID_ABI} STREQUAL "x86_64")
+if(${HOST_ABI} STREQUAL "x86_64")
set(EXTRA_LIBS "wallet-crypto")
else()
set(EXTRA_LIBS "")