Commit bffa48d7 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

DRTVWR-418: Tweak for 64-bit builds and build-variables.

parent 89b17913
......@@ -6,23 +6,30 @@ cd "$(dirname "$0")"
set -x
# make errors fatal
set -e
# complain about unset env variables
set -u
XMLRPCEPI_VERSION="0.54.1"
XMLRPCEPI_SOURCE_DIR="xmlrpc-epi-$XMLRPCEPI_VERSION"
XMLRPCEPI_SOURCE_DIR="xmlrpc-epi"
XMLRPCEPI_VERSION="$(sed -n 's/VERSION=\(.*\)$/\1/p' "$XMLRPCEPI_SOURCE_DIR/configure")"
if [ -z "$AUTOBUILD" ] ; then
fail
fi
if [ "$OSTYPE" = "cygwin" ] ; then
export AUTOBUILD="$(cygpath -u $AUTOBUILD)"
autobuild="$(cygpath -u $AUTOBUILD)"
else
autobuild="$AUTOBUILD"
fi
# load autbuild provided shell functions and variables
set +x
eval "$("$AUTOBUILD" source_environment)"
eval "$("$autobuild" source_environment)"
set -x
# set LL_BUILD and friends
set_build_variables convenience Release
copy_headers ()
{
cp src/base64.h $1
......@@ -57,8 +64,8 @@ pushd "$XMLRPCEPI_SOURCE_DIR"
mkdir -p "$stage/include/xmlrpc-epi"
copy_headers "$stage/include/xmlrpc-epi"
;;
"darwin")
opts='-arch i386 -iwithsysroot /Developer/SDKs/MacOSX10.9.sdk -mmacosx-version-min=10.7'
darwin*)
opts="-arch $AUTOBUILD_CONFIGURE_ARCH $LL_BUILD"
CFLAGS="$opts" CXXFLAGS="$opts" LDFLAGS="$opts" ./configure --prefix="$stage" \
--with-expat=no \
--with-expat-lib="$stage/packages/lib/release/libexpat.dylib" \
......@@ -76,8 +83,8 @@ pushd "$XMLRPCEPI_SOURCE_DIR"
install_name_tool -id "@executable_path/../Resources/libxmlrpc-epi.0.dylib" "$stage/lib/release/libxmlrpc-epi.0.dylib"
install_name_tool -change "/usr/lib/libexpat.1.dylib" "@executable_path/../Resources/libexpat.1.dylib" "$stage/lib/release/libxmlrpc-epi.0.dylib"
;;
"linux")
opts='-m32'
linux*)
opts="-m$AUTOBUILD_ADDRSIZE $LL_BUILD"
CFLAGS="$opts" CXXFLAGS="$opts" ./configure --prefix="$stage" \
--with-expat=no \
--with-expat-lib="$stage/packages/lib/release/libexpat.so" \
......@@ -97,4 +104,3 @@ pushd "$XMLRPCEPI_SOURCE_DIR"
popd
pass
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment