[CalendarServer-changes] [12450] twext/trunk/bin/_build.sh
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:18:07 PDT 2014
Revision: 12450
http://trac.calendarserver.org//changeset/12450
Author: wsanchez at apple.com
Date: 2014-01-24 14:49:36 -0800 (Fri, 24 Jan 2014)
Log Message:
-----------
Deal with ffi/ffi.h shenanighans.
Modified Paths:
--------------
twext/trunk/bin/_build.sh
Modified: twext/trunk/bin/_build.sh
===================================================================
--- twext/trunk/bin/_build.sh 2014-01-24 22:49:24 UTC (rev 12449)
+++ twext/trunk/bin/_build.sh 2014-01-24 22:49:36 UTC (rev 12450)
@@ -459,8 +459,12 @@
c_dependencies () {
ruler;
- if find_header ffi/ffi.h; then
+ if find_header ffi.h; then
using_system "libffi";
+ elif find_header ffi/ffi.h; then
+ mkdir -p "${dev_root}/include";
+ echo "#include <ffi/ffi.h>" > "${dev_root}/include/ffi.h"
+ using_system "libffi";
else
c_dependency -m "45f3b6dbc9ee7c7dfbbbc5feba571529" \
"libffi" "libffi-3.0.13" \
@@ -507,15 +511,13 @@
# export PYTHONPATH="${dev_libdir}:${PYTHONPATH:-}"
# export PATH="${dev_root}/bin:${PATH}";
- # export C_INCLUDE_PATH="${dev_root}/include:${C_INCLUDE_PATH:-}";
- # export LD_LIBRARY_PATH="${dev_root}/lib:${dev_root}/lib64:${LD_LIBRARY_PATH:-}";
- # export CPPFLAGS="-I${dev_root}/include ${CPPFLAGS:-} ";
- # 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 C_INCLUDE_PATH="${dev_root}/include:${C_INCLUDE_PATH:-}";
+ export LD_LIBRARY_PATH="${dev_root}/lib:${dev_root}/lib64:${LD_LIBRARY_PATH:-}";
+ export CPPFLAGS="-I${dev_root}/include ${CPPFLAGS:-} ";
+ 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:-}";
- # cd "${wd}";
-
for requirements in "${wd}/requirements/"*; do
ruler "Preparing Python requirements: ${requirements}";
@@ -531,7 +533,8 @@
echo "Requirements ${requirements} are optional; continuing.";
else
echo "";
- exit ${err};
+ echo "pip log: ${dev_home}/pip.log";
+ return 1;
fi;
fi;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/80915a82/attachment.html>
More information about the calendarserver-changes
mailing list