mirror of https://github.com/BOINC/boinc.git
Build Mac: fix bugs and add comments to build scripts
Fixes some copy and paste bugs reported by Charlie Fenton. Added ScreenSaver target aka screensaver coordinator which was missing from the CI build script.
This commit is contained in:
parent
76373f2120
commit
b27e56a20a
|
@ -140,6 +140,9 @@ if [ $retval -ne 0 ]; then cd ..; exit 1; fi
|
|||
#source BuildMacBOINC.sh ${config} -noclean -target ss_app -setting HEADER_SEARCH_PATHS "../api/ ../samples/jpeglib/ ${cache_dir}/include ${cache_dir}/include/freetype2" -setting LIBRARY_SEARCH_PATHS "${libSearchPath} ${cache_dir}/lib" | $beautifier; retval=${PIPESTATUS[0]}
|
||||
#if [ $retval -ne 0 ]; then cd ..; exit 1; fi
|
||||
|
||||
source BuildMacBOINC.sh ${config} -noclean -target ScreenSaver -setting GCC_ENABLE_OBJC_GC "unsupported" | $beautifier; retval=${PIPESTATUS[0]}
|
||||
if [ $retval -ne 0 ]; then cd ..; exit 1; fi
|
||||
|
||||
source BuildMacBOINC.sh ${config} -noclean -target boinc_opencl | $beautifier; retval=${PIPESTATUS[0]}
|
||||
if [ $retval -ne 0 ]; then cd ..; exit 1; fi
|
||||
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
doclean=""
|
||||
lprefix="/tmp/installed-c-ares"
|
||||
libPath="lib/.libs"
|
||||
libPath=".libs"
|
||||
while [[ $# -gt 0 ]]; do
|
||||
key="$1"
|
||||
case $key in
|
||||
|
|
|
@ -82,7 +82,7 @@ fi
|
|||
|
||||
doclean=""
|
||||
lprefix=""
|
||||
libPath=".libs"
|
||||
libPath="libs/.libs"
|
||||
libcares="/tmp/installed-c-ares"
|
||||
while [[ $# -gt 0 ]]; do
|
||||
key="$1"
|
||||
|
@ -163,6 +163,7 @@ else
|
|||
# curl configure and make expect a path to _installed_ c-ares-1.11.0
|
||||
# so we temporarily installed c-ares at a path that does not contain spaces.
|
||||
# buildc-ares.sh installed c-ares to /tmp/installed-c-ares
|
||||
# and configured c-ares with prefix=/tmp/installed-c-ares
|
||||
if [ ! -f "${libcares}/libcares.a" ]; then
|
||||
cd ../c-ares-1.11.0 || return 1
|
||||
make install
|
||||
|
|
|
@ -129,14 +129,16 @@ rm -fR objs/*.*
|
|||
rm -fR objs/*
|
||||
cp -p README-objs objs/README
|
||||
rm -f README-objs
|
||||
# this directory is only used when no --prefix argument was given
|
||||
rm -fR "../freetype_install/"
|
||||
|
||||
./configure --enable-shared=NO --prefix=${lprefix} --host=i386
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
|
||||
if [ "${doclean}" = "yes" ]; then
|
||||
make clean
|
||||
fi
|
||||
|
||||
./configure --enable-shared=NO --prefix=${lprefix} --host=i386
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
make 1>/dev/null
|
||||
if [ $? -ne 0 ]; then return 1; fi
|
||||
|
||||
|
@ -172,7 +174,9 @@ make install 1>/dev/null
|
|||
if [ $? -ne 0 ]; then return 1; fi
|
||||
|
||||
# remove installed items not needed by ftgl build
|
||||
rm -fR "${lprefix}/share"
|
||||
# this directory is only used when no --prefix argument was given
|
||||
rm -fR "../freetype_install/share"
|
||||
rm -fR "../freetype_install/lib"
|
||||
|
||||
lprefix=""
|
||||
export CC="";export CXX=""
|
||||
|
|
Loading…
Reference in New Issue