parent
eaadbbdab0
commit
643860776e
@ -0,0 +1,20 @@
|
|||||||
|
ANDROID_API=21
|
||||||
|
|
||||||
|
ifeq ($(host_arch),arm)
|
||||||
|
host_toolchain=arm-linux-androideabi-
|
||||||
|
endif
|
||||||
|
|
||||||
|
android_CC=$(host_toolchain)clang
|
||||||
|
android_CXX=$(host_toolchain)clang++
|
||||||
|
|
||||||
|
android_CFLAGS=-pipe
|
||||||
|
android_CXXFLAGS=$(android_CFLAGS)
|
||||||
|
|
||||||
|
android_release_CFLAGS=-O2
|
||||||
|
android_release_CXXFLAGS=$(android_release_CFLAGS)
|
||||||
|
|
||||||
|
android_debug_CFLAGS=-g -O0
|
||||||
|
android_debug_CXXFLAGS=$(android_debug_CFLAGS)
|
||||||
|
|
||||||
|
android_native_toolchain=android_ndk
|
||||||
|
|
@ -0,0 +1,22 @@
|
|||||||
|
package=android_ndk
|
||||||
|
$(package)_version=17b
|
||||||
|
$(package)_download_path=https://dl.google.com/android/repository/
|
||||||
|
$(package)_file_name=android-ndk-r$($(package)_version)-linux-x86_64.zip
|
||||||
|
$(package)_sha256_hash=5dfbbdc2d3ba859fed90d0e978af87c71a91a5be1f6e1c40ba697503d48ccecd
|
||||||
|
|
||||||
|
define $(package)_set_vars
|
||||||
|
$(package)_config_opts_arm=--arch arm
|
||||||
|
$(package)_config_opts_aarch64=--arch arm64
|
||||||
|
endef
|
||||||
|
|
||||||
|
define $(package)_extract_cmds
|
||||||
|
echo $($(package)_sha256_hash) $($(1)_source_dir)/$($(package)_file_name) | sha256sum -c &&\
|
||||||
|
unzip -q $($(1)_source_dir)/$($(package)_file_name)
|
||||||
|
endef
|
||||||
|
|
||||||
|
define $(package)_stage_cmds
|
||||||
|
android-ndk-r$($(package)_version)/build/tools/make_standalone_toolchain.py --api 21 \
|
||||||
|
--install-dir $(build_prefix) --stl=libc++ $($(package)_config_opts) &&\
|
||||||
|
mv $(build_prefix) $($(package)_staging_dir)/$(host_prefix)
|
||||||
|
endef
|
||||||
|
|
@ -0,0 +1,38 @@
|
|||||||
|
From ffe62d3398d5e0191f554f61049aa7ec9fc892ae Mon Sep 17 00:00:00 2001
|
||||||
|
From: Gregory Lemercier <greglemercier@free.fr>
|
||||||
|
Date: Sun, 7 Oct 2018 18:06:54 +0200
|
||||||
|
Subject: [PATCH] Fix build on arm64 architectures with some strict compilers
|
||||||
|
|
||||||
|
This patch fixes an issue that occurs on 64-bit architetures under
|
||||||
|
strict compiler rules. The code initially checked that the received
|
||||||
|
size stored in 'uint64_t' was not bigger than the max value of a
|
||||||
|
'size_t' variable, which is legitimate on 32-bit architectures where
|
||||||
|
'size_t' variables are stored on 32 bits. On 64-bit architectures,
|
||||||
|
this test no longer makes sense since 'uint64_t' and 'size_t' types
|
||||||
|
have the same size. The issue is fixed by ignoring this portion
|
||||||
|
of code when built for arm64.
|
||||||
|
---
|
||||||
|
src/v1_decoder.cpp | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/v1_decoder.cpp b/src/v1_decoder.cpp
|
||||||
|
index b002dc9d..2c8c97a7 100644
|
||||||
|
--- a/src/v1_decoder.cpp
|
||||||
|
+++ b/src/v1_decoder.cpp
|
||||||
|
@@ -114,11 +114,13 @@ int zmq::v1_decoder_t::eight_byte_size_ready ()
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef __aarch64__
|
||||||
|
// Message size must fit within range of size_t data type.
|
||||||
|
if (payload_length - 1 > std::numeric_limits <size_t>::max ()) {
|
||||||
|
errno = EMSGSIZE;
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
const size_t msg_size = static_cast <size_t> (payload_length - 1);
|
||||||
|
|
||||||
|
--
|
||||||
|
2.20.1
|
||||||
|
|
@ -0,0 +1,135 @@
|
|||||||
|
---
|
||||||
|
name: "monero-android-0.15"
|
||||||
|
enable_cache: true
|
||||||
|
suites:
|
||||||
|
- "bionic"
|
||||||
|
architectures:
|
||||||
|
- "amd64"
|
||||||
|
packages:
|
||||||
|
- "curl"
|
||||||
|
- "gperf"
|
||||||
|
- "gcc-7"
|
||||||
|
- "g++-7"
|
||||||
|
- "gcc"
|
||||||
|
- "g++"
|
||||||
|
- "binutils-gold"
|
||||||
|
- "git"
|
||||||
|
- "pkg-config"
|
||||||
|
- "build-essential"
|
||||||
|
- "autoconf"
|
||||||
|
- "libtool"
|
||||||
|
- "automake"
|
||||||
|
- "faketime"
|
||||||
|
- "bsdmainutils"
|
||||||
|
- "ca-certificates"
|
||||||
|
- "python"
|
||||||
|
- "cmake"
|
||||||
|
- "ccache"
|
||||||
|
- "protobuf-compiler"
|
||||||
|
- "libdbus-1-dev"
|
||||||
|
- "libharfbuzz-dev"
|
||||||
|
- "libprotobuf-dev"
|
||||||
|
- "python3-zmq"
|
||||||
|
- "unzip"
|
||||||
|
remotes:
|
||||||
|
- "url": "https://github.com/monero-project/monero.git"
|
||||||
|
"dir": "monero"
|
||||||
|
files: []
|
||||||
|
script: |
|
||||||
|
|
||||||
|
WRAP_DIR=$HOME/wrapped
|
||||||
|
HOSTS="arm-linux-android aarch64-linux-android"
|
||||||
|
FAKETIME_HOST_PROGS="clang clang++ ar ranlib nm"
|
||||||
|
FAKETIME_PROGS="date"
|
||||||
|
HOST_CFLAGS="-O2 -g"
|
||||||
|
HOST_CXXFLAGS="-O2 -g"
|
||||||
|
HOST_LDFLAGS=-static-libstdc++
|
||||||
|
|
||||||
|
export GZIP="-9n"
|
||||||
|
export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
|
||||||
|
export TZ="UTC"
|
||||||
|
export BUILD_DIR=`pwd`
|
||||||
|
mkdir -p ${WRAP_DIR}
|
||||||
|
if test -n "$GBUILD_CACHE_ENABLED"; then
|
||||||
|
export SOURCES_PATH=${GBUILD_COMMON_CACHE}
|
||||||
|
export BASE_CACHE=${GBUILD_PACKAGE_CACHE}
|
||||||
|
mkdir -p ${BASE_CACHE} ${SOURCES_PATH}
|
||||||
|
fi
|
||||||
|
|
||||||
|
export ZERO_AR_DATE=1
|
||||||
|
|
||||||
|
function create_global_faketime_wrappers {
|
||||||
|
for prog in ${FAKETIME_PROGS}; do
|
||||||
|
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${prog}
|
||||||
|
echo "REAL=\`which -a ${prog} | grep -v ${WRAP_DIR}/${prog} | head -1\`" >> ${WRAP_DIR}/${prog}
|
||||||
|
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${prog}
|
||||||
|
echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${prog}
|
||||||
|
echo "\$REAL \$@" >> $WRAP_DIR/${prog}
|
||||||
|
chmod +x ${WRAP_DIR}/${prog}
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
function create_per-host_faketime_wrappers {
|
||||||
|
for i in $HOSTS; do
|
||||||
|
ABI=$i
|
||||||
|
if expr $i : arm- > /dev/null
|
||||||
|
then
|
||||||
|
ABI=$i"eabi"
|
||||||
|
fi
|
||||||
|
NDKDIR="${BUILD_DIR}/monero/contrib/depends/$i/native/bin"
|
||||||
|
for prog in ${FAKETIME_HOST_PROGS}; do
|
||||||
|
WRAPPER=${WRAP_DIR}/${ABI}-${prog}
|
||||||
|
echo '#!/usr/bin/env bash' > ${WRAPPER}
|
||||||
|
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAPPER}
|
||||||
|
echo "export FAKETIME=\"$1\"" >> ${WRAPPER}
|
||||||
|
echo "$NDKDIR/${ABI}-$prog \$@" >> ${WRAPPER}
|
||||||
|
chmod +x ${WRAPPER}
|
||||||
|
done
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
# Faketime for depends so intermediate results are comparable
|
||||||
|
DUMMYTIME="2000-01-01 12:00:00"
|
||||||
|
export PATH_orig=${PATH}
|
||||||
|
create_global_faketime_wrappers "$DUMMYTIME"
|
||||||
|
create_per-host_faketime_wrappers "$DUMMYTIME"
|
||||||
|
export PATH=${WRAP_DIR}:${PATH}
|
||||||
|
|
||||||
|
# gcc 7+ honors SOURCE_DATE_EPOCH, no faketime needed
|
||||||
|
export SOURCE_DATE_EPOCH=`date -d "$DUMMYTIME" +%s`
|
||||||
|
|
||||||
|
git config --global core.abbrev 9
|
||||||
|
cd monero
|
||||||
|
# Set the version string that gets added to the tar archive name
|
||||||
|
version="`git describe`"
|
||||||
|
if [[ $version == *"-"*"-"* ]]; then
|
||||||
|
version="`git rev-parse --short=9 HEAD`"
|
||||||
|
version="`echo $version | head -c 9`"
|
||||||
|
fi
|
||||||
|
|
||||||
|
BASEPREFIX=`pwd`/contrib/depends
|
||||||
|
# Build dependencies for each host
|
||||||
|
for i in $HOSTS; do
|
||||||
|
make ${MAKEOPTS} -C ${BASEPREFIX} HOST="${i}"
|
||||||
|
done
|
||||||
|
|
||||||
|
# Faketime for binaries
|
||||||
|
export PATH=${PATH_orig}
|
||||||
|
create_global_faketime_wrappers "${REFERENCE_DATETIME}"
|
||||||
|
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
|
||||||
|
export PATH=${WRAP_DIR}:${PATH}
|
||||||
|
|
||||||
|
ORIGPATH="$PATH"
|
||||||
|
# Build in a new dir for each host
|
||||||
|
for i in ${HOSTS}; do
|
||||||
|
export PATH=${BASEPREFIX}/${i}/native/bin:${ORIGPATH}
|
||||||
|
mkdir build && cd build
|
||||||
|
cmake .. -DCMAKE_TOOLCHAIN_FILE=${BASEPREFIX}/${i}/share/toolchain.cmake -DCMAKE_BUILD_TYPE=Release
|
||||||
|
make ${MAKEOPTS}
|
||||||
|
DISTNAME=monero-${i}-${version}
|
||||||
|
mv bin ${DISTNAME}
|
||||||
|
find ${DISTNAME}/ | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | bzip2 -9 > ${OUTDIR}/${DISTNAME}.tar.bz2
|
||||||
|
cd ..
|
||||||
|
rm -rf build
|
||||||
|
done
|
||||||
|
|
Loading…
Reference in new issue