[CalendarServer-changes] [12939] twext/trunk/bin/_build.sh

[source_changes at macosforge.org]

Revision: 12939
          http://trac.calendarserver.org//changeset/12939
Author:   wsanchez at apple.com
Date:     2014-03-18 11:44:57 -0700 (Tue, 18 Mar 2014)
Log Message:
-----------
sync

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

Modified: twext/trunk/bin/_build.sh
===================================================================
--- twext/trunk/bin/_build.sh	2014-03-18 18:44:30 UTC (rev 12938)
+++ twext/trunk/bin/_build.sh	2014-03-18 18:44:57 UTC (rev 12939)
@@ -18,18 +18,6 @@
 . "${wd}/bin/_py.sh";
 
 
-echo_header () {
-  echo "$@";
-  echo "";
-}
-
-
-using_system () {
-  local name="$1"; shift;
-  echo_header "Using system version of ${name}.";
-}
-
-
 # Provide a default value: if the variable named by the first argument is
 # empty, set it to the default in the second argument.
 conditional_set () {
@@ -109,7 +97,6 @@
 
   project="$(setup_print name)";
 
-  export PYTHONPATH="${wd}:${PYTHONPATH:-}";
   export _DEVELOP_PROJECT_="${project}";
 
   # These variables are defaults for things which might be configured by
@@ -471,16 +458,26 @@
 
 
 ruler () {
-  echo "____________________________________________________________";
-  echo "";
+  if "${do_setup}"; then
+    echo "____________________________________________________________";
+    echo "";
 
-  if [ $# -gt 0 ]; then
-    echo "$@";
+    if [ $# -gt 0 ]; then
+      echo "$@";
+    fi;
   fi;
 }
 
 
+using_system () {
+  if "${do_setup}"; then
+    local name="$1"; shift;
+    echo "Using system version of ${name}.";
+    echo "";
+  fi;
+}
 
+
 #
 # Build C dependencies
 #
@@ -494,9 +491,11 @@
   if find_header ffi.h; then
     using_system "libffi";
   elif find_header ffi/ffi.h; then
-    mkdir -p "${c_glue_include}";
-    echo "#include <ffi/ffi.h>" > "${c_glue_include}/ffi.h"
-    using_system "libffi";
+    if "${do_setup}"; then
+      mkdir -p "${c_glue_include}";
+      echo "#include <ffi/ffi.h>" > "${c_glue_include}/ffi.h"
+      using_system "libffi";
+    fi;
   else
     c_dependency -m "45f3b6dbc9ee7c7dfbbbc5feba571529" \
       "libffi" "libffi-3.0.13" \
@@ -520,9 +519,11 @@
   if find_header sasl.h; then
     using_system "SASL";
   elif find_header sasl/sasl.h; then
-    mkdir -p "${c_glue_include}";
-    echo "#include <sasl/sasl.h>" > "${c_glue_include}/sasl.h"
-    using_system "SASL";
+    if "${do_setup}"; then
+      mkdir -p "${c_glue_include}";
+      echo "#include <sasl/sasl.h>" > "${c_glue_include}/sasl.h"
+      using_system "SASL";
+    fi;
   else
     local v="2.1.26";
     local n="cyrus-sasl";
@@ -575,6 +576,8 @@
 #
 py_dependencies () {
   export PATH="${py_root}/bin:${PATH}";
+  export PYTHON="${python}";
+  export PYTHONPATH="${wd}:${PYTHONPATH:-}";
 
   if ! "${do_setup}"; then return 0; fi;
 
@@ -591,6 +594,16 @@
 
   "${python}" "${wd}/setup.py" check > /dev/null;
 
+  # Work around a change in Xcode tools that breaks Python modules in OS X
+  # 10.9.2 and prior due to a hard error if the -mno-fused-madd is used, as
+  # it was in the system Python, and is therefore passed along by disutils.
+  if [ "$(uname -s)" == "Darwin" ]; then
+    if "${python}" -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("CFLAGS")' \
+       | grep -e -mno-fused-madd > /dev/null; then
+      export ARCHFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future";
+    fi;
+  fi;
+
   for requirements in "${wd}/requirements/py_"*".txt"; do
 
     ruler "Preparing Python requirements: ${requirements}";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140318/0ce19c8d/attachment.html>