[CalendarServer-changes] [12296] twext/trunk/bin/_build.sh
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:21:39 PDT 2014
Revision: 12296
http://trac.calendarserver.org//changeset/12296
Author: wsanchez at apple.com
Date: 2014-01-10 17:31:53 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
Modified Paths:
--------------
twext/trunk/bin/_build.sh
Modified: twext/trunk/bin/_build.sh
===================================================================
--- twext/trunk/bin/_build.sh 2014-01-11 01:09:58 UTC (rev 12295)
+++ twext/trunk/bin/_build.sh 2014-01-11 01:31:53 UTC (rev 12296)
@@ -15,9 +15,6 @@
# limitations under the License.
##
-set -e
-set -u
-
. "${wd}/bin/_py.sh";
@@ -455,7 +452,7 @@
--disable-bdb --disable-hdb;
fi;
- if find_header sasl.h; then
+ if find_header sasl/sasl.h; then
using_system "SASL";
else
local v="2.1.26";
@@ -463,7 +460,8 @@
local p="${n}-${v}";
c_dependency -m "a7f4e5e559a0e37b3ffc438c9456e425" \
"Cyrus SASL" "${p}" \
- "ftp://ftp.cyrusimap.org/cyrus-sasl/${p}.tar.gz";
+ "ftp://ftp.cyrusimap.org/cyrus-sasl/${p}.tar.gz" \
+ --disable-macos-framework;
fi;
}
@@ -485,7 +483,6 @@
export LDFLAGS="-L${dev_root}/lib -L${dev_root}/lib64 ${LDFLAGS:-} ";
export DYLD_LIBRARY_PATH="${dev_root}/lib:${dev_root}/lib64:${DYLD_LIBRARY_PATH:-}";
export PKG_CONFIG_PATH="${dev_root}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
- export CFLAGS="${CPPFLAGS} ${LDFLAGS}";
cd "${wd}";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/4f3b997f/attachment.html>
More information about the calendarserver-changes
mailing list