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

File build-osx-libs_patch_10.9.patch, 1.7 KB (added by Echelon9, 7 years ago)

Patch against r14732 for addressing use of -stdlib=libc++ with wxWidgets

  • libraries/osx/build-osx-libs.sh

     
    321321popd > /dev/null
    322322
    323323# --------------------------------------------------------------
    324 # TODO: This build takes ages, anything we can exlude?
     324# TODO: This build takes ages, anything we can exclude?
    325325echo -e "Building wxWidgets..."
    326326
    327327LIB_VERSION="${WXWIDGETS_VERSION}"
     
    347347  pushd build-release
    348348
    349349  # disable XML and richtext support, to avoid dependency on expat
    350   CONF_OPTS="--prefix=$INSTALL_DIR --disable-shared --enable-unicode --with-cocoa --with-opengl --with-libiconv-prefix=${ICONV_DIR} --disable-richtext --without-expat --without-sdl"
     350  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"
    351351  # wxWidgets configure now defaults to targeting 10.5, if not specified,
    352352  # but that conflicts with our flags
    353353  if [[ $MIN_OSX_VERSION && ${MIN_OSX_VERSION-_} ]]; then
    354354    CONF_OPTS="$CONF_OPTS --with-macosx-version-min=$MIN_OSX_VERSION"
    355355  fi
     356  if [[ $SYSROOT && ${SYSROOT-_} ]]; then
     357    CONF_OPTS="$CONF_OPTS --with-macosx-sdk=$SYSROOT"
     358  fi
    356359
    357   (../configure CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" $CONF_OPTS && make ${JOBS} && make install) || die "wxWidgets build failed"
     360  (../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"
    358361  popd
    359362  popd
    360363  touch .already-built