Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Arrange android ci

This commit is contained in:
Tal Regev 2021-03-30 20:09:15 +03:00
parent f333e6fef9
commit bab0ef9645
14 changed files with 153 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/android.yml vendored
View File

@ -33,7 +33,6 @@ jobs:
with:
path: 3rdParty/buildCache
key: android-${{ matrix.type }}-${{ hashFiles('android/*.sh') }}
restore-keys: android-${{ matrix.type }}-
- name: Build manager
if: ${{ success() && matrix.type == 'manager' }}

43
android/buildAndroidBOINC-CI.sh
View File

@ -141,9 +141,6 @@ if [ "${silent}" = "yes" ]; then
export STDOUT_TARGET="/dev/null"
fi
export COMPILEOPENSSL="no"
export COMPILECURL="no"
export ANDROID_TC_FLAGFILE="$PREFIX/ANDROID_TC_WITH_NDK-${NDK_VERSION}-${arch}-${REV}_done"
export NDK_FLAGFILE="$PREFIX/NDK-${NDK_VERSION}-${REV}_done"
export NDK_ARMV6_FLAGFILE="$PREFIX/NDK-${NDK_ARMV6_VERSION}-armv6-${ARMV6_REV}_done"
export NDK_ROOT=$BUILD_DIR/android-ndk-r${NDK_VERSION}
@ -159,9 +156,11 @@ export BUILD_WITH_VCPKG=$build_with_vcpkg
if [ "$arch" = armv6 ]; then
export CURL_FLAGFILE="$PREFIX/curl-${CURL_VERSION}-${NDK_ARMV6_VERSION}-${arch}_done"
export OPENSSL_FLAGFILE="$PREFIX/openssl-${OPENSSL_VERSION}-${NDK_ARMV6_VERSION}-${arch}_done"
export ANDROID_TC_FLAGFILE="$PREFIX/ANDROID_TC_WITH_NDK-${NDK_ARMV6_VERSION}-${arch}-${ARMV6_REV}_done"
else
export CURL_FLAGFILE="$PREFIX/curl-${CURL_VERSION}-${NDK_VERSION}-${arch}_done"
export OPENSSL_FLAGFILE="$PREFIX/openssl-${OPENSSL_VERSION}-${NDK_VERSION}-${arch}_done"
export ANDROID_TC_FLAGFILE="$PREFIX/ANDROID_TC_WITH_NDK-${NDK_VERSION}-${arch}-${REV}_done"
fi
createNDKFolder()
@ -183,25 +182,9 @@ if [ ! -e "${NDK_FLAGFILE}" ]; then
touch "${NDK_FLAGFILE}"
fi
if [ ! -e "${ANDROID_TC_FLAGFILE}" ]; then
if [ $arch != "armv6" ]; then
rm -rf "${PREFIX}/${arch}"
echo delete "${PREFIX}/${arch}"
rm -rf "${OPENSSL_FLAGFILE}"
rm -rf "${CURL_FLAGFILE}"
touch ${ANDROID_TC_FLAGFILE}
fi
fi
if [ ! -e "${NDK_ARMV6_FLAGFILE}" ]; then
if [ $arch = "armv6" ]; then
rm -rf "${PREFIX}/${arch}"
echo delete "${PREFIX}/${arch}"
rm -rf "${OPENSSL_FLAGFILE}"
rm -rf "${CURL_FLAGFILE}"
createNDKARMV6Folder
touch "${NDK_ARMV6_FLAGFILE}"
fi
createNDKARMV6Folder
touch "${NDK_ARMV6_FLAGFILE}"
fi
if [ ! -d $NDK_ROOT ]; then
@ -212,18 +195,24 @@ if [ ! -d $NDK_ARMV6_ROOT ]; then
createNDKARMV6Folder
fi
if [ ! -e "${ANDROID_TC_FLAGFILE}" ]; then
rm -rf "${PREFIX}/${arch}"
echo delete "${PREFIX}/${arch}"
rm -rf "${OPENSSL_FLAGFILE}"
rm -rf "${CURL_FLAGFILE}"
touch ${ANDROID_TC_FLAGFILE}
fi
if [ ! -e "${OPENSSL_FLAGFILE}" ]; then
rm -rf "$BUILD_DIR/openssl-${OPENSSL_VERSION}"
wget -c --no-verbose -O /tmp/openssl_${OPENSSL_VERSION}.tgz https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
tar xzf /tmp/openssl_${OPENSSL_VERSION}.tgz --directory=$BUILD_DIR
export COMPILEOPENSSL="yes"
fi
if [ ! -e "${CURL_FLAGFILE}" ]; then
rm -rf "$BUILD_DIR/curl-${CURL_VERSION}"
wget -c --no-verbose -O /tmp/curl_${CURL_VERSION}.tgz https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz
tar xzf /tmp/curl_${CURL_VERSION}.tgz --directory=$BUILD_DIR
export COMPILECURL="yes"
fi
patchVcpkgScripts()
@ -427,6 +416,11 @@ Armv6TestApps()
Armv6Test boinc_gahp uc2 ucn multi_thread sleeper worker wrapper wrappture_example fermi
}
NeonTestApps()
{
NeonTest boinc_gahp uc2 ucn multi_thread sleeper worker wrapper
}
RenameAllApps()
{
list_apps="../samples/condor/ boinc_gahp
@ -478,6 +472,7 @@ case "$arch" in
./build_libraries_armv6.sh
./build_example_armv6.sh
NeonTestLibs
NeonTestApps
Armv6TestLibs
Armv6TestApps
if [ "$ci" = "yes" ]; then
@ -510,6 +505,8 @@ case "$arch" in
./build_curl_arm.sh
./build_libraries_arm.sh
./build_example_arm.sh
NeonTestLibs
NeonTestApps
if [ "$ci" = "yes" ]; then
RenameAllApps arm
fi

20
android/build_curl_arm.sh
View File

@ -7,7 +7,6 @@ set -e
# Script to compile Libcurl for Android
COMPILECURL="${COMPILECURL:-yes}"
STDOUT_TARGET="${STDOUT_TARGET:-/dev/stdout}"
CONFIGURE="yes"
MAKECLEAN="yes"
@ -36,7 +35,7 @@ export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then
MAKE_FLAGS="$MAKE_FLAGS --silent 1>$STDOUT_TARGET"
MAKE_FLAGS="$MAKE_FLAGS --silent"
else
MAKE_FLAGS="$MAKE_FLAGS SHELL=\"/bin/bash -x\""
fi
@ -47,7 +46,7 @@ else
MAKE_FLAGS="$MAKE_FLAGS -j $NPROC_USER"
fi
if [ "$COMPILECURL" = "yes" ]; then
if [ ! -e "${CURL_FLAGFILE}" ]; then
cd "$CURL"
echo "===== building curl for arm from $PWD ====="
if [ -n "$MAKECLEAN" ] && $(grep -q "^distclean:" "${CURL}/Makefile"); then
@ -60,12 +59,15 @@ if [ "$COMPILECURL" = "yes" ]; then
if [ -n "$CONFIGURE" ]; then
./configure --host=arm-linux --prefix="$TCINCLUDES" --libdir="$TCINCLUDES/lib" --disable-shared --enable-static --with-random=/dev/urandom --without-zlib 1>$STDOUT_TARGET
fi
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install $MAKE_FLAGS
if [ ! -z ${CURL_FLAGFILE} ]; then
touch "${CURL_FLAGFILE}"
if [ $VERBOSE = "no" ]; then
echo MAKE_FLAGS=$MAKE_FLAGS "1>$STDOUT_TARGET"
make $MAKE_FLAGS 1>$STDOUT_TARGET
make install $MAKE_FLAGS 1>$STDOUT_TARGET
else
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install $MAKE_FLAGS
fi
touch "${CURL_FLAGFILE}"
echo "===== curl for arm build done ====="
fi

21
android/build_curl_arm64.sh
View File

@ -7,7 +7,6 @@ set -e
# Script to compile Libcurl for Android
COMPILECURL="${COMPILECURL:-yes}"
STDOUT_TARGET="${STDOUT_TARGET:-/dev/stdout}"
CONFIGURE="yes"
MAKECLEAN="yes"
@ -36,7 +35,7 @@ export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then
MAKE_FLAGS="$MAKE_FLAGS --silent 1>$STDOUT_TARGET"
MAKE_FLAGS="$MAKE_FLAGS --silent"
else
MAKE_FLAGS="$MAKE_FLAGS SHELL=\"/bin/bash -x\""
fi
@ -47,7 +46,7 @@ else
MAKE_FLAGS="$MAKE_FLAGS -j $NPROC_USER"
fi
if [ "$COMPILECURL" = "yes" ]; then
if [ ! -e "${CURL_FLAGFILE}" ]; then
cd "$CURL"
echo "===== building curl for arm64 from $PWD ====="
if [ -n "$MAKECLEAN" ] && $(grep -q "^distclean:" "${CURL}/Makefile"); then
@ -60,12 +59,16 @@ if [ "$COMPILECURL" = "yes" ]; then
if [ -n "$CONFIGURE" ]; then
./configure --host=aarch64-linux --prefix="$TCINCLUDES" --libdir="$TCINCLUDES/lib" --disable-shared --enable-static --with-random=/dev/urandom 1>$STDOUT_TARGET
fi
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install $MAKE_FLAGS
if [ ! -z ${CURL_FLAGFILE} ]; then
touch "${CURL_FLAGFILE}"
if [ $VERBOSE = "no" ]; then
echo MAKE_FLAGS=$MAKE_FLAGS "1>$STDOUT_TARGET"
make $MAKE_FLAGS 1>$STDOUT_TARGET
make install $MAKE_FLAGS 1>$STDOUT_TARGET
else
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install $MAKE_FLAGS
fi
touch "${CURL_FLAGFILE}"
echo "===== curl for arm64 build done ====="
fi

21
android/build_curl_armv6.sh
View File

@ -7,7 +7,6 @@ set -e
# Script to compile Libcurl for Android
COMPILECURL="${COMPILECURL:-yes}"
STDOUT_TARGET="${STDOUT_TARGET:-/dev/stdout}"
CONFIGURE="yes"
MAKECLEAN="yes"
@ -38,7 +37,7 @@ export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then
MAKE_FLAGS="$MAKE_FLAGS --silent 1>$STDOUT_TARGET"
MAKE_FLAGS="$MAKE_FLAGS --silent"
else
MAKE_FLAGS="$MAKE_FLAGS SHELL=\"/bin/bash -x\""
fi
@ -49,7 +48,7 @@ else
MAKE_FLAGS="$MAKE_FLAGS -j $NPROC_USER"
fi
if [ "$COMPILECURL" = "yes" ]; then
if [ ! -e "${CURL_FLAGFILE}" ]; then
cd "$CURL"
echo "===== building curl for armv6 from $PWD ====="
if [ -n "$MAKECLEAN" ] && $(grep -q "^distclean:" "${CURL}/Makefile"); then
@ -62,12 +61,16 @@ if [ "$COMPILECURL" = "yes" ]; then
if [ -n "$CONFIGURE" ]; then
./configure --host=armv6-linux --prefix="$TCINCLUDES" --libdir="$TCINCLUDES/lib" --disable-shared --enable-static --with-random=/dev/urandom --without-zlib 1>$STDOUT_TARGET
fi
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install $MAKE_FLAGS
if [ $VERBOSE = "no" ]; then
echo MAKE_FLAGS=$MAKE_FLAGS "1>$STDOUT_TARGET"
make $MAKE_FLAGS 1>$STDOUT_TARGET
make install $MAKE_FLAGS 1>$STDOUT_TARGET
else
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install $MAKE_FLAGS
fi
if [ ! -z ${CURL_FLAGFILE} ]; then
touch "${CURL_FLAGFILE}"
fi
touch "${CURL_FLAGFILE}"
echo "===== curl for armv6 build done ====="
fi

21
android/build_curl_x86.sh
View File

@ -7,7 +7,6 @@ set -e
# Script to compile Libcurl for Android
COMPILECURL="${COMPILECURL:-yes}"
STDOUT_TARGET="${STDOUT_TARGET:-/dev/stdout}"
CONFIGURE="yes"
MAKECLEAN="yes"
@ -36,7 +35,7 @@ export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then
MAKE_FLAGS="$MAKE_FLAGS --silent 1>$STDOUT_TARGET"
MAKE_FLAGS="$MAKE_FLAGS --silent"
else
MAKE_FLAGS="$MAKE_FLAGS SHELL=\"/bin/bash -x\""
fi
@ -47,7 +46,7 @@ else
MAKE_FLAGS="$MAKE_FLAGS -j $NPROC_USER"
fi
if [ "$COMPILECURL" = "yes" ]; then
if [ ! -e "${CURL_FLAGFILE}" ]; then
cd "$CURL"
echo "===== building curl for x86 from $PWD ====="
if [ -n "$MAKECLEAN" ] && $(grep -q "^distclean:" "${CURL}/Makefile"); then
@ -60,12 +59,16 @@ if [ "$COMPILECURL" = "yes" ]; then
if [ -n "$CONFIGURE" ]; then
./configure --host=i686-linux --prefix="$TCINCLUDES" --libdir="$TCINCLUDES/lib" --disable-shared --enable-static --with-random=/dev/urandom 1>$STDOUT_TARGET
fi
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install $MAKE_FLAGS
if [ ! -z ${CURL_FLAGFILE} ]; then
touch "${CURL_FLAGFILE}"
if [ $VERBOSE = "no" ]; then
echo MAKE_FLAGS=$MAKE_FLAGS "1>$STDOUT_TARGET"
make $MAKE_FLAGS 1>$STDOUT_TARGET
make install $MAKE_FLAGS 1>$STDOUT_TARGET
else
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install $MAKE_FLAGS
fi
touch "${CURL_FLAGFILE}"
echo "===== curl for x86 build done ====="
fi

21
android/build_curl_x86_64.sh
View File

@ -7,7 +7,6 @@ set -e
# Script to compile Libcurl for Android
COMPILECURL="${COMPILECURL:-yes}"
STDOUT_TARGET="${STDOUT_TARGET:-/dev/stdout}"
CONFIGURE="yes"
MAKECLEAN="yes"
@ -36,7 +35,7 @@ export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then
MAKE_FLAGS="$MAKE_FLAGS --silent 1>$STDOUT_TARGET"
MAKE_FLAGS="$MAKE_FLAGS --silent"
else
MAKE_FLAGS="$MAKE_FLAGS SHELL=\"/bin/bash -x\""
fi
@ -47,7 +46,7 @@ else
MAKE_FLAGS="$MAKE_FLAGS -j $NPROC_USER"
fi
if [ "$COMPILECURL" = "yes" ]; then
if [ ! -e "${CURL_FLAGFILE}" ]; then
cd "$CURL"
echo "===== building curl for x86-64 from $PWD ====="
if [ -n "$MAKECLEAN" ] && $(grep -q "^distclean:" "${CURL}/Makefile"); then
@ -60,12 +59,16 @@ if [ "$COMPILECURL" = "yes" ]; then
if [ -n "$CONFIGURE" ]; then
./configure --host=x86_64-linux --prefix="$TCINCLUDES" --libdir="$TCINCLUDES/lib" --disable-shared --enable-static --with-random=/dev/urandom 1>$STDOUT_TARGET
fi
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install $MAKE_FLAGS
if [ ! -z ${CURL_FLAGFILE} ]; then
touch "${CURL_FLAGFILE}"
if [ $VERBOSE = "no" ]; then
echo MAKE_FLAGS=$MAKE_FLAGS "1>$STDOUT_TARGET"
make $MAKE_FLAGS 1>$STDOUT_TARGET
make install $MAKE_FLAGS 1>$STDOUT_TARGET
else
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install $MAKE_FLAGS
fi
touch "${CURL_FLAGFILE}"
echo "===== curl for x86-64 build done ====="
fi

25
android/build_openssl_arm.sh
View File

@ -7,7 +7,6 @@ set -e
# Script to compile OpenSSL for Android
COMPILEOPENSSL="${COMPILEOPENSSL:-yes}"
STDOUT_TARGET="${STDOUT_TARGET:-/dev/stdout}"
CONFIGURE="yes"
MAKECLEAN="yes"
@ -36,18 +35,18 @@ export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then
MAKE_FLAGS="$MAKE_FLAGS --silent 1>$STDOUT_TARGET"
MAKE_FLAGS="$MAKE_FLAGS --silent"
else
MAKE_FLAGS="$MAKE_FLAGS SHELL=\"/bin/bash -x\""
fi
if [ $CI = "yes" ]; then
MAKE_FLAGS="$MAKE_FLAGS -j $(nproc --all)"
MAKE_FLAGS1="$MAKE_FLAGS -j $(nproc --all)"
else
MAKE_FLAGS="$MAKE_FLAGS -j $NPROC_USER"
MAKE_FLAGS1="$MAKE_FLAGS -j $NPROC_USER"
fi
if [ "$COMPILEOPENSSL" = "yes" ]; then
if [ ! -e "${OPENSSL_FLAGFILE}" ]; then
cd "$OPENSSL"
echo "===== building openssl for arm from $PWD ====="
if [ -n "$MAKECLEAN" ]; then
@ -63,12 +62,16 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then
sed -e "s/^CFLAG=.*$/`grep -e \^CFLAG= Makefile` \$(CFLAGS)/g" Makefile > Makefile.out
mv Makefile.out Makefile
fi
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install_sw $MAKE_FLAGS
if [ ! -z ${OPENSSL_FLAGFILE} ]; then
touch "${OPENSSL_FLAGFILE}"
if [ $VERBOSE = "no" ]; then
echo MAKE_FLAGS=$MAKE_FLAGS "1>$STDOUT_TARGET"
make $MAKE_FLAGS 1>$STDOUT_TARGET
make install_sw $MAKE_FLAGS 1>$STDOUT_TARGET
else
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install_sw $MAKE_FLAGS
fi
touch "${OPENSSL_FLAGFILE}"
echo "===== openssl for arm build done ====="
fi

25
android/build_openssl_arm64.sh
View File

@ -7,7 +7,6 @@ set -e
# Script to compile OpenSSL for Android
COMPILEOPENSSL="${COMPILEOPENSSL:-yes}"
STDOUT_TARGET="${STDOUT_TARGET:-/dev/stdout}"
CONFIGURE="yes"
MAKECLEAN="yes"
@ -36,18 +35,18 @@ export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then
MAKE_FLAGS="$MAKE_FLAGS --silent 1>$STDOUT_TARGET"
MAKE_FLAGS="$MAKE_FLAGS --silent"
else
MAKE_FLAGS="$MAKE_FLAGS SHELL=\"/bin/bash -x\""
fi
if [ $CI = "yes" ]; then
MAKE_FLAGS="$MAKE_FLAGS -j $(nproc --all)"
MAKE_FLAGS1="$MAKE_FLAGS -j $(nproc --all)"
else
MAKE_FLAGS="$MAKE_FLAGS -j $NPROC_USER"
MAKE_FLAGS1="$MAKE_FLAGS -j $NPROC_USER"
fi
if [ "$COMPILEOPENSSL" = "yes" ]; then
if [ ! -e "${OPENSSL_FLAGFILE}" ]; then
cd "$OPENSSL"
echo "===== building openssl for arm64 from $PWD ====="
if [ -n "$MAKECLEAN" ]; then
@ -63,12 +62,16 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then
sed -e "s/^CFLAG=.*$/`grep -e \^CFLAG= Makefile` \$(CFLAGS)/g" Makefile > Makefile.out
mv Makefile.out Makefile
fi
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install_sw $MAKE_FLAGS
if [ ! -z ${OPENSSL_FLAGFILE} ]; then
touch "${OPENSSL_FLAGFILE}"
if [ $VERBOSE = "no" ]; then
echo MAKE_FLAGS=$MAKE_FLAGS "1>$STDOUT_TARGET"
make $MAKE_FLAGS 1>$STDOUT_TARGET
make install_sw $MAKE_FLAGS 1>$STDOUT_TARGET
else
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install_sw $MAKE_FLAGS
fi
touch "${OPENSSL_FLAGFILE}"
echo "===== openssl for arm64 build done ====="
fi

25
android/build_openssl_armv6.sh
View File

@ -7,7 +7,6 @@ set -e
# Script to compile OpenSSL for Android
COMPILEOPENSSL="${COMPILEOPENSSL:-yes}"
STDOUT_TARGET="${STDOUT_TARGET:-/dev/stdout}"
CONFIGURE="yes"
MAKECLEAN="yes"
@ -38,18 +37,18 @@ export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then
MAKE_FLAGS="$MAKE_FLAGS --silent 1>$STDOUT_TARGET"
MAKE_FLAGS="$MAKE_FLAGS --silent"
else
MAKE_FLAGS="$MAKE_FLAGS SHELL=\"/bin/bash -x\""
fi
if [ $CI = "yes" ]; then
MAKE_FLAGS="$MAKE_FLAGS -j $(nproc --all)"
MAKE_FLAGS1="$MAKE_FLAGS -j $(nproc --all)"
else
MAKE_FLAGS="$MAKE_FLAGS -j $NPROC_USER"
MAKE_FLAGS1="$MAKE_FLAGS -j $NPROC_USER"
fi
if [ "$COMPILEOPENSSL" = "yes" ]; then
if [ ! -e "${OPENSSL_FLAGFILE}" ]; then
cd "$OPENSSL"
echo "===== building openssl for armv6 from $PWD ====="
if [ -n "$MAKECLEAN" ]; then
@ -65,12 +64,16 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then
sed -e "s/^CFLAG=.*$/`grep -e \^CFLAG= Makefile` \$(CFLAGS)/g" Makefile > Makefile.out
mv Makefile.out Makefile
fi
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install_sw $MAKE_FLAGS
if [ $VERBOSE = "no" ]; then
echo MAKE_FLAGS=$MAKE_FLAGS "1>$STDOUT_TARGET"
make $MAKE_FLAGS 1>$STDOUT_TARGET
make install_sw $MAKE_FLAGS 1>$STDOUT_TARGET
else
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install_sw $MAKE_FLAGS
fi
if [ ! -z ${OPENSSL_FLAGFILE} ]; then
touch "${OPENSSL_FLAGFILE}"
fi
touch "${OPENSSL_FLAGFILE}"
echo "===== openssl for armv6 build done ====="
fi

22
android/build_openssl_x86.sh
View File

@ -7,7 +7,6 @@ set -e
# Script to compile OpenSSL for Android
COMPILEOPENSSL="${COMPILEOPENSSL:-yes}"
STDOUT_TARGET="${STDOUT_TARGET:-/dev/stdout}"
CONFIGURE="yes"
MAKECLEAN="yes"
@ -36,18 +35,18 @@ export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then
MAKE_FLAGS="$MAKE_FLAGS --silent 1>$STDOUT_TARGET"
MAKE_FLAGS="$MAKE_FLAGS --silent"
else
MAKE_FLAGS="$MAKE_FLAGS SHELL=\"/bin/bash -x\""
fi
if [ $CI = "yes" ]; then
MAKE_FLAGS="$MAKE_FLAGS -j $(nproc --all)"
MAKE_FLAGS1="$MAKE_FLAGS -j $(nproc --all)"
else
MAKE_FLAGS="$MAKE_FLAGS -j $NPROC_USER"
MAKE_FLAGS1="$MAKE_FLAGS -j $NPROC_USER"
fi
if [ "$COMPILEOPENSSL" = "yes" ]; then
if [ ! -e "${OPENSSL_FLAGFILE}" ]; then
cd "$OPENSSL"
echo "===== building openssl for x86 from $PWD ====="
if [ -n "$MAKECLEAN" ]; then
@ -63,9 +62,16 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then
sed -e "s/^CFLAG=.*$/`grep -e \^CFLAG= Makefile` \$(CFLAGS)/g" Makefile > Makefile.out
mv Makefile.out Makefile
fi
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install_sw $MAKE_FLAGS
if [ $VERBOSE = "no" ]; then
echo MAKE_FLAGS=$MAKE_FLAGS "1>$STDOUT_TARGET"
make $MAKE_FLAGS 1>$STDOUT_TARGET
make install_sw $MAKE_FLAGS 1>$STDOUT_TARGET
else
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install_sw $MAKE_FLAGS
fi
touch "${OPENSSL_FLAGFILE}"
echo "===== openssl for x86 build done ====="
fi

25
android/build_openssl_x86_64.sh
View File

@ -7,7 +7,6 @@ set -e
# Script to compile OpenSSL for Android
COMPILEOPENSSL="${COMPILEOPENSSL:-yes}"
STDOUT_TARGET="${STDOUT_TARGET:-/dev/stdout}"
CONFIGURE="yes"
MAKECLEAN="yes"
@ -36,18 +35,18 @@ export GDB_CFLAGS="--sysroot=$TCSYSROOT -Wall -g -I$TCINCLUDES/include"
MAKE_FLAGS=""
if [ $VERBOSE = "no" ]; then
MAKE_FLAGS="$MAKE_FLAGS --silent 1>$STDOUT_TARGET"
MAKE_FLAGS="$MAKE_FLAGS --silent"
else
MAKE_FLAGS="$MAKE_FLAGS SHELL=\"/bin/bash -x\""
fi
if [ $CI = "yes" ]; then
MAKE_FLAGS="$MAKE_FLAGS -j $(nproc --all)"
MAKE_FLAGS1="$MAKE_FLAGS -j $(nproc --all)"
else
MAKE_FLAGS="$MAKE_FLAGS -j $NPROC_USER"
MAKE_FLAGS1="$MAKE_FLAGS -j $NPROC_USER"
fi
if [ "$COMPILEOPENSSL" = "yes" ]; then
if [ ! -e "${OPENSSL_FLAGFILE}" ]; then
cd "$OPENSSL"
echo "===== building openssl for x86-64 from $PWD ====="
if [ -n "$MAKECLEAN" ]; then
@ -63,12 +62,16 @@ if [ "$COMPILEOPENSSL" = "yes" ]; then
sed -e "s/^CFLAG=.*$/`grep -e \^CFLAG= Makefile` \$(CFLAGS)/g" Makefile > Makefile.out
mv Makefile.out Makefile
fi
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install_sw $MAKE_FLAGS
if [ ! -z ${OPENSSL_FLAGFILE} ]; then
touch "${OPENSSL_FLAGFILE}"
if [ $VERBOSE = "no" ]; then
echo MAKE_FLAGS=$MAKE_FLAGS "1>$STDOUT_TARGET"
make $MAKE_FLAGS 1>$STDOUT_TARGET
make install_sw $MAKE_FLAGS 1>$STDOUT_TARGET
else
echo MAKE_FLAGS=$MAKE_FLAGS
make $MAKE_FLAGS
make install_sw $MAKE_FLAGS
fi
touch "${OPENSSL_FLAGFILE}"
echo "===== openssl for x86-64 build done ====="
fi

2
client/Makefile.curl.am
View File

@ -59,7 +59,7 @@ boinc_client_SOURCES = \
boinc_client_DEPENDENCIES = $(LIBRSA)
boinc_client_CPPFLAGS = -D_USE_CURL -I../../curl-7.14.0/include -I $(srcdir)/win $(AM_CPPFLAGS) -O3
boinc_client_LDFLAGS = -static-libgcc
boinc_client_LDADD = -L/usr/local/ssl/lib -lssl -L../../curl-7.14.0/lib -lcurl -L../lib -lboinc $(RSA_LIBS) $(PTHREAD_LIBS)
boinc_client_LDADD = -L/usr/local/ssl/lib -L../../curl-7.14.0/lib -L../lib -lcurl -lssl -lcrypto -lboinc $(RSA_LIBS) $(PTHREAD_LIBS)
#boinc_client_LDFLAGS = $(STATIC_FLAGS)
# the following don't do anything

5
client/Makefile.linux
View File

@ -134,10 +134,11 @@ clean:
rm -f $(PROGS) $(BOINC_OBJ) dependencies
LIBS = ../lib/lib.a \
-L /usr/local/lib/ \
-lpthread \
-lX11 -lXss \
-lssl -lcrypto \
-L /usr/local/lib/ -lcurl -lz -ldl
-lcurl -lssl -lcrypto \
-lz -ldl
.cpp.o:
$(CC) -c -o $*.o $<