[CalendarServer-changes] [12449] CalendarServer/trunk/bin/_build.sh

[source_changes at macosforge.org]

Revision: 12449
          http://trac.calendarserver.org//changeset/12449
Author:   wsanchez at apple.com
Date:     2014-01-24 14:49:24 -0800 (Fri, 24 Jan 2014)
Log Message:
-----------
Deal with ffi/ffi.h shenanighans.

Modified Paths:
--------------
    CalendarServer/trunk/bin/_build.sh

Modified: CalendarServer/trunk/bin/_build.sh
===================================================================
--- CalendarServer/trunk/bin/_build.sh	2014-01-24 22:48:51 UTC (rev 12448)
+++ CalendarServer/trunk/bin/_build.sh	2014-01-24 22:49:24 UTC (rev 12449)
@@ -458,6 +458,19 @@
 c_dependencies () {
 
   ruler;
+  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" \
+      "ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz"
+  fi;
+
+  ruler;
   if find_header ldap.h 20428 LDAP_VENDOR_VERSION; then
     using_system "OpenLDAP";
   else
@@ -471,12 +484,12 @@
   fi;
 
   ruler;
-  if find_header sasl/sasl.h && ! find_header sasl.h; then
+  if find_header sasl.h; then
+    using_system "SASL";
+  elif find_header sasl/sasl.h; then
     mkdir -p "${dev_root}/include";
     echo "#include <sasl/sasl.h>" > "${dev_root}/include/sasl.h"
     using_system "SASL";
-  elif find_header sasl.h; then
-    using_system "SASL";
   else
     local v="2.1.26";
     local n="cyrus-sasl";
@@ -488,15 +501,6 @@
   fi;
 
   ruler;
-  if find_header ffi/ffi.h; then
-    using_system "libffi";
-  else
-    c_dependency -m "45f3b6dbc9ee7c7dfbbbc5feba571529" \
-      "libffi" "libffi-3.0.13" \
-      "ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz"
-  fi;
-
-  ruler;
   if type -P memcached > /dev/null; then
     using_system "memcached";
   else
@@ -540,15 +544,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}";
@@ -565,7 +567,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/8949b45f/attachment.html>