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

Mac: Try yet again to fix CI Travis build failure

This commit is contained in:
Charlie Fenton 2020-08-22 06:00:40 -07:00
parent 649b950f27
commit 505fb0d9db
5 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mac_build/buildFTGL.sh
View File

@ -91,13 +91,13 @@ fi
GCC_can_build_x86_64="no"
GCC_can_build_arm64="no"
GCC_archs=`lipo -info "${GCCPATH}"`
if [[ "${GCC_archs}" == *"x86_64"* ]]; then GCC_can_build_x86_64="yes"; fi
if [[ "${GCC_archs}" == *"arm64"* ]]; then GCC_can_build_arm64="yes"; fi
if [ "${doclean}" != "yes" ]; then
if [ -f "${libPath}/libftgl.a" ]; then
alreadyBuilt=1
GCC_archs=`lipo -archs "${GCCPATH}"`
if [[ "${GCC_archs}" == *"x86_64"* ]]; then $GCC_can_build_x86_64="yes"; fi
if [[ "${GCC_archs}" == *"arm64"* ]]; then $GCC_can_build_arm64="yes"; fi
if [ $GCC_can_build_x86_64 == "yes" ]; then
lipo "${libPath}/libftgl.a" -verify_arch x86_64
if [ $? -ne 0 ]; then alreadyBuilt=0; doclean="yes"; fi
@ -164,12 +164,19 @@ if [ "${doclean}" == "yes" ]; then
make clean 1>$stdout_target
fi
cd src || return 1
cd src
if [ $? -ne 0 ]; then
cd "${SRCDIR}"
return 1
fi
make 1>$stdout_target
if [ $? -ne 0 ]; then
cd "${SRCDIR}"
return 1;
fi
cd "${SRCDIR}"
if [ $? -ne 0 ]; then return 1; fi
cd "${SRCDIR}" || return 1
# Now see if we can build for arm64
# Note: Some versions of Xcode 12 don't support building for arm64
@ -205,8 +212,8 @@ if [ $GCC_can_build_arm64 == "yes" ]; then
make 1>$stdout_target
if [ $? -ne 0 ]; then
rm -f libftgl_x86_64.a
cd "${SRCDIR}" || return 1
return 1;
cd "${SRCDIR}"
return 1
fi
mv -f .libs/libftgl.a .libs/libftgl_arm64.a
@ -214,8 +221,8 @@ if [ $GCC_can_build_arm64 == "yes" ]; then
lipo -create libftgl_x86_64.a .libs/libftgl_arm64.a -output .libs/libftgl.a
if [ $? -ne 0 ]; then
rm -f libftgl_x86_64.a libs/libftgl_arm64.a
cd "${SRCDIR}" || return 1
return 1;
cd "${SRCDIR}"
return 1
fi
rm -f libftgl_x86_64.a
@ -227,13 +234,16 @@ fi
if [ "x${lprefix}" != "x" ]; then
# this installs the modified library
cd src || return 1
make install 1>$stdout_target
if [ $? -ne 0 ]; then
cd "${SRCDIR}" || return 1
return 1;
cd "${SRCDIR}"
return 1
fi
fi
cd "${SRCDIR}"
lprefix=""
export CC="";export CXX=""
export LDFLAGS=""

6
mac_build/buildc-ares.sh
View File

@ -105,14 +105,14 @@ if [ $? -ne 0 ]; then
fi
GCC_can_build_x86_64="no"
GCC_can_build_arm64="no"
GCC_archs=`lipo -info "${GCCPATH}"`
if [[ "${GCC_archs}" == *"x86_64"* ]]; then GCC_can_build_x86_64="yes"; fi
if [[ "${GCC_archs}" == *"arm64"* ]]; then GCC_can_build_arm64="yes"; fi
if [ "${doclean}" != "yes" ]; then
if [ -f "${libPath}/libcares.a" ]; then
alreadyBuilt=1
GCC_archs=`lipo -archs "${GCCPATH}"`
if [[ "${GCC_archs}" == *"x86_64"* ]]; then GCC_can_build_x86_64="yes"; fi
if [[ "${GCC_archs}" == *"arm64"* ]]; then GCC_can_build_arm64="yes"; fi
if [ $GCC_can_build_x86_64 == "yes" ]; then
lipo "${libPath}/libcares.a" -verify_arch x86_64
if [ $? -ne 0 ]; then alreadyBuilt=0; doclean="yes"; fi

6
mac_build/buildcurl.sh
View File

@ -132,14 +132,14 @@ fi
GCC_can_build_x86_64="no"
GCC_can_build_arm64="no"
GCC_archs=`lipo -info "${GCCPATH}"`
if [[ "${GCC_archs}" == *"x86_64"* ]]; then GCC_can_build_x86_64="yes"; fi
if [[ "${GCC_archs}" == *"arm64"* ]]; then GCC_can_build_arm64="yes"; fi
if [ "${doclean}" != "yes" ]; then
if [ -f "${libPath}/libcurl.a" ]; then
alreadyBuilt=1
GCC_archs=`lipo -archs "${GCCPATH}"`
if [[ "${GCC_archs}" == *"x86_64"* ]]; then GCC_can_build_x86_64="yes"; fi
if [[ "${GCC_archs}" == *"arm64"* ]]; then GCC_can_build_arm64="yes"; fi
if [ $GCC_can_build_x86_64 == "yes" ]; then
lipo "${libPath}/libcurl.a" -verify_arch x86_64
if [ $? -ne 0 ]; then alreadyBuilt=0; doclean="yes"; fi

11
mac_build/buildfreetype.sh
View File

@ -96,14 +96,14 @@ fi
GCC_can_build_x86_64="no"
GCC_can_build_arm64="no"
GCC_archs=`lipo -info "${GCCPATH}"`
if [[ "${GCC_archs}" == *"x86_64"* ]]; then GCC_can_build_x86_64="yes"; fi
if [[ "${GCC_archs}" == *"arm64"* ]]; then GCC_can_build_arm64="yes"; fi
if [ "${doclean}" != "yes" ]; then
if [ -f "${libPath}/libfreetype.a" ]; then
alreadyBuilt=1
GCC_archs=`lipo -archs "${GCCPATH}"`
if [[ "${GCC_archs}" == *"x86_64"* ]]; then GCC_can_build_x86_64="yes"; fi
if [[ "${GCC_archs}" == *"arm64"* ]]; then GCC_can_build_arm64="yes"; fi
if [ $GCC_can_build_x86_64 == "yes" ]; then
lipo "${libPath}/libfreetype.a" -verify_arch x86_64
if [ $? -ne 0 ]; then alreadyBuilt=0; doclean="yes"; fi
@ -155,7 +155,7 @@ rm -fR "../freetype_install/"
# Build for x86_64 architecture
export CC="${GCCPATH}";export CXX="${GPPPATH}"
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,x86_64"
export CPPFLAGS=""
export CPPFLAGS="-isysroot ${SDKPATH} -arch x86_64 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070"
export CXXFLAGS="-isysroot ${SDKPATH} -arch x86_64 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070"
export CFLAGS="-isysroot ${SDKPATH} -arch x86_64 -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070"
export SDKROOT="${SDKPATH}"
@ -177,7 +177,7 @@ if [ $GCC_can_build_arm64 == "yes" ]; then
export CC="${GCCPATH}";export CXX="${GPPPATH}"
export LDFLAGS="-Wl,-syslibroot,${SDKPATH},-arch,arm64"
export CPPFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos10.7 -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070"
export CPPFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos10.7 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070"
export CXXFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos10.7 -stdlib=libc++ -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070"
export CFLAGS="-isysroot ${SDKPATH} -target arm64-apple-macos10.7 -DMAC_OS_X_VERSION_MAX_ALLOWED=1070 -DMAC_OS_X_VERSION_MIN_REQUIRED=1070"
export SDKROOT="${SDKPATH}"
@ -228,6 +228,7 @@ rm -f ../freetype_install/lib/libfreetype.*
lprefix=""
export CC="";export CXX=""
export LDFLAGS=""
export CXXFLAGS=""
export CPPFLAGS=""
export CFLAGS=""
export SDKROOT=""

6
mac_build/buildopenssl.sh
View File

@ -85,14 +85,14 @@ fi
GCC_can_build_x86_64="no"
GCC_can_build_arm64="no"
GCC_archs=`lipo -info "${GCCPATH}"`
if [[ "${GCC_archs}" == *"x86_64"* ]]; then GCC_can_build_x86_64="yes"; fi
if [[ "${GCC_archs}" == *"arm64"* ]]; then GCC_can_build_arm64="yes"; fi
if [ "${doclean}" != "yes" ]; then
if [ -f ${libPath}/libssl.a ] && [ -f ${libPath}/libcrypto.a ]; then
alreadyBuilt=1
GCC_archs=`lipo -archs "${GCCPATH}"`
if [[ "${GCC_archs}" == *"x86_64"* ]]; then GCC_can_build_x86_64="yes"; fi
if [[ "${GCC_archs}" == *"arm64"* ]]; then GCC_can_build_arm64="yes"; fi
if [ $GCC_can_build_x86_64 == "yes" ]; then
lipo "${libPath}/libssl.a" -verify_arch x86_64
if [ $? -ne 0 ]; then alreadyBuilt=0; doclean="yes"; fi