<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13467] CalendarServer/trunk/bin/_build.sh</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13467">13467</a></dd>
<dt>Author</dt> <dd>dre@apple.com</dd>
<dt>Date</dt> <dd>2014-05-09 13:48:38 -0700 (Fri, 09 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bring back a few required tweaks for OpenSSL and OpenSSL builds that allow us to succeed on Linux</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbin_buildsh">CalendarServer/trunk/bin/_build.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbin_buildsh"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/_build.sh (13466 => 13467)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/_build.sh 2014-05-08 21:47:48 UTC (rev 13466)
+++ CalendarServer/trunk/bin/_build.sh 2014-05-09 20:48:38 UTC (rev 13467)
</span><span class="lines">@@ -343,13 +343,18 @@
</span><span class="cx"> c_dependency () {
</span><span class="cx"> local f_hash="";
</span><span class="cx"> local configure="configure";
</span><ins>+ local prebuild_cmd="";
+ local build_cmd="jmake";
+ local install_cmd="make install";
</ins><span class="cx">
</span><span class="cx"> OPTIND=1;
</span><del>- while getopts "m:s:c:" option; do
</del><ins>+ while getopts "m:s:c:p:b:" option; do
</ins><span class="cx"> case "${option}" in
</span><span class="cx"> 'm') f_hash="-m ${OPTARG}"; ;;
</span><span class="cx"> 's') f_hash="-s ${OPTARG}"; ;;
</span><span class="cx"> 'c') configure="${OPTARG}"; ;;
</span><ins>+ 'p') prebuild_cmd="${OPTARG}"; ;;
+ 'b') build_cmd="${OPTARG}"; ;;
</ins><span class="cx"> esac;
</span><span class="cx"> done;
</span><span class="cx"> shift $((${OPTIND} - 1));
</span><span class="lines">@@ -384,8 +389,11 @@
</span><span class="cx"> echo "Building ${name}...";
</span><span class="cx"> cd "${srcdir}";
</span><span class="cx"> "./${configure}" --prefix="${dstroot}" "$@";
</span><del>- jmake;
- jmake install;
</del><ins>+ if [ ! -z "${prebuild_cmd}" ]; then
+ eval ${prebuild_cmd};
+ fi;
+ eval ${build_cmd};
+ eval ${install_cmd};
</ins><span class="cx"> cd "${wd}";
</span><span class="cx"> else
</span><span class="cx"> echo "Using built ${name}.";
</span><span class="lines">@@ -430,13 +438,13 @@
</span><span class="cx"> # value of OPENSSL_VERSION_NUBMER for use in inequality comparison.
</span><span class="cx"> ruler;
</span><span class="cx">
</span><del>- local min_ssl_version="9470367000"; # OpenSSL 0.9.8y
</del><ins>+ local min_ssl_version="9470367"; # OpenSSL 0.9.8y
</ins><span class="cx">
</span><span class="cx"> local ssl_version="$(c_macro openssl/ssl.h OPENSSL_VERSION_NUMBER)";
</span><span class="cx"> if [ -z "${ssl_version}" ]; then ssl_version="0x0"; fi;
</span><span class="cx"> ssl_version="$("${bootstrap_python}" -c "print ${ssl_version}")";
</span><span class="cx">
</span><del>- if [ "${ssl_version}" -lt "${min_ssl_version}" ]; then
</del><ins>+ if [ "${ssl_version}" -ge "${min_ssl_version}" ]; then
</ins><span class="cx"> using_system "OpenSSL";
</span><span class="cx"> else
</span><span class="cx"> local v="0.9.8y";
</span><span class="lines">@@ -446,8 +454,9 @@
</span><span class="cx"> # use 'config' instead of 'configure'; 'make' instead of 'jmake'.
</span><span class="cx"> # also pass 'shared' to config to build shared libs.
</span><span class="cx"> c_dependency -c "config" -m "47c7fb37f78c970f1d30aa2f9e9e26d8" \
</span><ins>+ -p "make depend" -b "make" \
</ins><span class="cx"> "openssl" "${p}" \
</span><del>- "http://www.openssl.org/source/${p}.tar.gz" "no-ssl2";
</del><ins>+ "http://www.openssl.org/source/${p}.tar.gz" "shared";
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -482,7 +491,7 @@
</span><span class="cx"> c_dependency -m "39831848c731bcaef235a04e0d14412f" \
</span><span class="cx"> "OpenLDAP" "${p}" \
</span><span class="cx"> "http://www.openldap.org/software/download/OpenLDAP/${n}-release/${p}.tgz" \
</span><del>- --disable-bdb --disable-hdb;
</del><ins>+ --disable-bdb --disable-hdb --with-tls=openssl;
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>