[CalendarServer-changes] [11754] CalendarServer/trunk/support/build.sh
source_changes at macosforge.org
source_changes at macosforge.org
Tue Sep 24 18:42:01 PDT 2013
Revision: 11754
http://trac.calendarserver.org//changeset/11754
Author: dre at apple.com
Date: 2013-09-24 18:42:01 -0700 (Tue, 24 Sep 2013)
Log Message:
-----------
Fix root build on linux where there is no ffi
Modified Paths:
--------------
CalendarServer/trunk/support/build.sh
Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh 2013-09-24 21:51:19 UTC (rev 11753)
+++ CalendarServer/trunk/support/build.sh 2013-09-25 01:42:01 UTC (rev 11754)
@@ -598,10 +598,11 @@
export PATH="${dstroot}/bin:${PATH}";
export C_INCLUDE_PATH="${dstroot}/include:${C_INCLUDE_PATH:-}";
- export LD_LIBRARY_PATH="${dstroot}/lib:${LD_LIBRARY_PATH:-}";
+ export LD_LIBRARY_PATH="${dstroot}/lib:${dstroot}/lib64:${LD_LIBRARY_PATH:-}";
export CPPFLAGS="-I${dstroot}/include ${CPPFLAGS:-} ";
- export LDFLAGS="-L${dstroot}/lib ${LDFLAGS:-} ";
- export DYLD_LIBRARY_PATH="${dstroot}/lib:${DYLD_LIBRARY_PATH:-}";
+ export LDFLAGS="-L${dstroot}/lib -L${dstroot}/lib64 ${LDFLAGS:-} ";
+ export DYLD_LIBRARY_PATH="${dstroot}/lib:${dstroot}/lib64:${DYLD_LIBRARY_PATH:-}";
+ export PKG_CONFIG_PATH="${dstroot}/lib/pkgconfig:${PKG_CONFIG_PATH:-}";
if "${do_setup}"; then
if "${force_setup}" || "${do_bundle}" || [ ! -d "${dstroot}" ]; then
@@ -626,10 +627,10 @@
cat > "${dstroot}/environment.sh" << __EOF__
export PATH="${dstroot}/bin:\${PATH}";
export C_INCLUDE_PATH="${dstroot}/include:\${C_INCLUDE_PATH:-}";
-export LD_LIBRARY_PATH="${dstroot}/lib:\${LD_LIBRARY_PATH:-}:\$ORACLE_HOME";
+export LD_LIBRARY_PATH="${dstroot}/lib:${dstroot}/lib64:\${LD_LIBRARY_PATH:-}:\$ORACLE_HOME";
export CPPFLAGS="-I${dstroot}/include \${CPPFLAGS:-} ";
-export LDFLAGS="-L${dstroot}/lib \${LDFLAGS:-} ";
-export DYLD_LIBRARY_PATH="${dstroot}/lib:\${DYLD_LIBRARY_PATH:-}:\$ORACLE_HOME";
+export LDFLAGS="-L${dstroot}/lib -L${dstroot}/lib64 \${LDFLAGS:-} ";
+export DYLD_LIBRARY_PATH="${dstroot}/lib:${dstroot}/lib64:\${DYLD_LIBRARY_PATH:-}:\$ORACLE_HOME";
__EOF__
}
@@ -707,6 +708,14 @@
--disable-bdb --disable-hdb;
fi;
+ 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;
+
#
# Python dependencies
#
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130924/29105168/attachment.html>
More information about the calendarserver-changes
mailing list