diff --git a/mac_build/buildMacBOINC-CI.sh b/mac_build/buildMacBOINC-CI.sh index 923b6f0c2b..75d2450310 100755 --- a/mac_build/buildMacBOINC-CI.sh +++ b/mac_build/buildMacBOINC-CI.sh @@ -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 diff --git a/mac_build/buildc-ares.sh b/mac_build/buildc-ares.sh index 4c5109016b..2a233909bc 100644 --- a/mac_build/buildc-ares.sh +++ b/mac_build/buildc-ares.sh @@ -46,7 +46,7 @@ doclean="" lprefix="/tmp/installed-c-ares" -libPath="lib/.libs" +libPath=".libs" while [[ $# -gt 0 ]]; do key="$1" case $key in diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh index fedd601128..e5a6f48ce1 100644 --- a/mac_build/buildcurl.sh +++ b/mac_build/buildcurl.sh @@ -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 diff --git a/mac_build/buildfreetype.sh b/mac_build/buildfreetype.sh index ffd7ea3a94..fd484ce9b3 100644 --- a/mac_build/buildfreetype.sh +++ b/mac_build/buildfreetype.sh @@ -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=""