Ticket #2304: build-osx-libs_patch_10.9.patch

libraries/osx/build-osx-libs.sh

@@ -321 +321 @@
 popd > /dev/null
 
 # --------------------------------------------------------------
-# TODO: This build takes ages, anything we can exlude?
+# TODO: This build takes ages, anything we can exclude?
 echo -e "Building wxWidgets..."
 
 LIB_VERSION="${WXWIDGETS_VERSION}"
@@ -347 +347 @@
   pushd build-release
 
   # disable XML and richtext support, to avoid dependency on expat
-  CONF_OPTS="--prefix=$INSTALL_DIR --disable-shared --enable-unicode --with-cocoa --with-opengl --with-libiconv-prefix=${ICONV_DIR} --disable-richtext --without-expat --without-sdl"
+  CONF_OPTS="--prefix=$INSTALL_DIR --disable-shared --enable-unicode --with-osx_cocoa --with-opengl --with-libiconv-prefix=${ICONV_DIR} --disable-richtext --without-expat --without-sdl"
   # wxWidgets configure now defaults to targeting 10.5, if not specified,
   # but that conflicts with our flags
   if [[ $MIN_OSX_VERSION && ${MIN_OSX_VERSION-_} ]]; then
     CONF_OPTS="$CONF_OPTS --with-macosx-version-min=$MIN_OSX_VERSION"
   fi
+  if [[ $SYSROOT && ${SYSROOT-_} ]]; then
+    CONF_OPTS="$CONF_OPTS --with-macosx-sdk=$SYSROOT"
+  fi
 
-  (../configure CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" $CONF_OPTS && make ${JOBS} && make install) || die "wxWidgets build failed"
+  (../configure CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -stdlib=libc++" OBJCXXFLAGS="$CPPFLAGS -stdlib=libc++" LDFLAGS="$LDFLAGS -stdlib=libc++" $CONF_OPTS && make ${JOBS} && make install) || die "wxWidgets build failed"
   popd
   popd
   touch .already-built