diff --git a/Makefile b/Makefile index 933d1d3..4d40612 100644 --- a/Makefile +++ b/Makefile @@ -107,11 +107,7 @@ boost: iconv $(script)/boost/fetch.sh $(script)/boost/build.sh -zlib: toolchain - $(script)/zlib/fetch.sh - $(script)/zlib/build.sh - -openssl: zlib +openssl: toolchain $(script)/openssl/fetch.sh $(script)/openssl/build.sh diff --git a/etc/scripts/build-external-libs/openssl/build.sh b/etc/scripts/build-external-libs/openssl/build.sh index 96945d9..cdb28a6 100755 --- a/etc/scripts/build-external-libs/openssl/build.sh +++ b/etc/scripts/build-external-libs/openssl/build.sh @@ -73,9 +73,8 @@ for arch in ${archs[@]}; do ./Configure android-${arch} \ --prefix=${PREFIX} \ + no-comp \ -D__ANDROID_API__=$ANDROID_API \ - --with-zlib-include=${ZLIB_PATH}/include \ - --with-zlib-lib=${ZLIB_PATH}/lib \ && make -j${NPROC} && make install && make clean \ ) diff --git a/etc/scripts/build-external-libs/zlib/build.sh b/etc/scripts/build-external-libs/zlib/build.sh deleted file mode 100755 index 41a5f6c..0000000 --- a/etc/scripts/build-external-libs/zlib/build.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash - -# Copyright (c) 2019, The Wownero Project -# Copyright (c) 2014-2019, The Monero Project -# -# All rights reserved. -# -# 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. -# -# 3. Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. -# -# 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 HOLDER 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 -e - -source etc/scripts/build-external-libs/env.sh - -build_root=$BUILD_ROOT -src_root=$BUILD_ROOT_SRC - -name=zlib -version=1.2.11 - -cd $src_root/${name}-${version} - -archs=(arm64) -for arch in ${archs[@]}; do - extra_cmake_flags="" - case ${arch} in - "arm64") - target_host=aarch64-linux-android - ;; - "x86_64") - target_host=x86_64-linux-android - ;; - *) - exit 16 - ;; - esac - - # PREFIX=$build_root/build/${name}/$arch - PREFIX=$build_root/build/$arch - echo "building for ${arch}" - - export CC=clang - export CXX=clang++ - - ( - PATH=$build_root/tool/$arch/$target_host/bin:$build_root/tool/$arch/bin:$PATH; \ - ./configure \ - --prefix=${PREFIX} \ - --static \ - && make -j${NPROC} && make install && make clean \ - ) - -done - -exit 0 diff --git a/etc/scripts/build-external-libs/zlib/fetch.sh b/etc/scripts/build-external-libs/zlib/fetch.sh deleted file mode 100755 index 2881dbb..0000000 --- a/etc/scripts/build-external-libs/zlib/fetch.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (c) 2019, The Wownero Project -# Copyright (c) 2014-2019, The Monero Project -# -# All rights reserved. -# -# 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. -# -# 3. Neither the name of the copyright holder nor the names of its contributors may be -# used to endorse or promote products derived from this software without specific -# prior written permission. -# -# 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 HOLDER 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 -e - -source etc/scripts/build-external-libs/env.sh - -cd $BUILD_ROOT_SRC - -name=zlib -version=1.2.11 -hash=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 - -rm -rf ${name}-${version} - -curl -# -L -O \ - https://zlib.net/${name}-${version}.tar.gz - -echo "${hash} ${name}-${version}.tar.gz" | sha256sum -c - -tar xzf ${name}-${version}.tar.gz