Author: brane
Date: Fri Oct 26 11:48:30 2018
New Revision: 1844897
URL: http://svn.apache.org/viewvc?rev=1844897&view=rev
Log:
Update the scripts for the macOS builder.
Modified:
serf/tools/buildbot/macosx/serfbuild.sh
serf/tools/buildbot/macosx/setenv.sh
Modified: serf/tools/buildbot/macosx/serfbuild.sh
URL:
http://svn.apache.org/viewvc/serf/tools/buildbot/macosx/serfbuild.sh?rev=1844897&r1=1844896&r2=1844897&view=diff
==============================================================================
--- serf/tools/buildbot/macosx/serfbuild.sh (original)
+++ serf/tools/buildbot/macosx/serfbuild.sh Fri Oct 26 11:48:30 2018
@@ -28,16 +28,20 @@ ${scripts}/mkramdisk.sh ${volume_name} $
# An optional parameter tells build scripts which version of APR to use
if [ ! -z "$1" ]; then
- aprdir=$(eval 'echo $SERFBB_'"$1")
+ aprdir=$(eval 'echo $SERFBB_APR_'"$1")
+ apudir=$(eval 'echo $SERFBB_APU_'"$1")
aprconfig="APR=${aprdir}"
- apuconfig="APU=${aprdir}"
+ apuconfig="APU=${apudir}"
+else
+ aprconfig="APR=${SERFBB_APR_DEFAULT}"
+ apuconfig="APU=${SERFBB_APU_DEFAULT}"
fi
# Another optional parameter tells build scripts to use a different OpenSSL
if [ ! -z "$2" ]; then
opensslconfig="OPENSSL=$(eval 'echo $SERFBB_'"$2")"
else
- opensslconfig="OPENSSL=${SERFBB_OPENSSL}"
+ opensslconfig="OPENSSL=${SERFBB_OPENSSL_DEFAULT}"
fi
# Build
@@ -45,6 +49,8 @@ cd "${absbld}"
"${SERFBB_SCONS}" -Y "${abssrc}" \
"CC=clang" \
"PREFIX=${absbld}/.install-prefix" \
+ "GSSAPI=/usr" \
+ "ZLIB=/usr" \
"${opensslconfig}" \
"${aprconfig}" \
"${apuconfig}"
Modified: serf/tools/buildbot/macosx/setenv.sh
URL:
http://svn.apache.org/viewvc/serf/tools/buildbot/macosx/setenv.sh?rev=1844897&r1=1844896&r2=1844897&view=diff
==============================================================================
--- serf/tools/buildbot/macosx/setenv.sh (original)
+++ serf/tools/buildbot/macosx/setenv.sh Fri Oct 26 11:48:30 2018
@@ -20,10 +20,14 @@
##
## PATH The search path
## SERFBB_SCONS Path to the scons binary
-## SERFBB_APR_15 Path of APR-1.5
+## SERFBB_APR_DEFAULT Path of default APR
+## SERFBB_APU_DEFAULT Path of default APR-Util
+## SERFBB_APR_OPENSSL_11 Path of default APR
+## SERFBB_APU_OPENSSL_11 Path of APR-Util to use with OpenSSL 1.1
## SERFBB_APR_20_DEV Path of APR-2.0
-## SERFBB_OPENSSL OpenSSL installation prefix
-## SERFBB_SYSTEM_OPENSSL System default OpenSSL prefix
+## SERFBB_APU_20_DEV Also path of APR-2.0
+## SERFBB_OPENSSL_DEFAULT Default OpenSSL installation prefix
+## SERFBB_OPENSSL_11 OpenSSL 1.1.x installation prefix
##
## The invoking script will set local variable named ${scripts} that
## is the absolute path the parent of this file.
@@ -35,10 +39,14 @@ eval $(${environment})
export PATH
export SERFBB_SCONS
-export SERFBB_APR_15
+export SERFBB_APR_DEFAULT
+export SERFBB_APU_DEFAULT
+export SERFBB_APR_OPENSSL_11
+export SERFBB_APU_OPENSSL_11
export SERFBB_APR_20_DEV
-export SERFBB_OPENSSL
-export SERFBB_SYSTEM_OPENSSL
+export SERFBB_APU_20_DEV
+export SERFBB_OPENSSL_DEFAULT
+export SERFBB_OPENSSL_11
# Set the absolute source path
