Ticket #2304: build-osx-libs_patch_10.9.patch
File build-osx-libs_patch_10.9.patch, 1.7 KB (added by , 10 years ago) |
---|
-
libraries/osx/build-osx-libs.sh
321 321 popd > /dev/null 322 322 323 323 # -------------------------------------------------------------- 324 # TODO: This build takes ages, anything we can ex lude?324 # TODO: This build takes ages, anything we can exclude? 325 325 echo -e "Building wxWidgets..." 326 326 327 327 LIB_VERSION="${WXWIDGETS_VERSION}" … … 347 347 pushd build-release 348 348 349 349 # 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" 351 351 # wxWidgets configure now defaults to targeting 10.5, if not specified, 352 352 # but that conflicts with our flags 353 353 if [[ $MIN_OSX_VERSION && ${MIN_OSX_VERSION-_} ]]; then 354 354 CONF_OPTS="$CONF_OPTS --with-macosx-version-min=$MIN_OSX_VERSION" 355 355 fi 356 if [[ $SYSROOT && ${SYSROOT-_} ]]; then 357 CONF_OPTS="$CONF_OPTS --with-macosx-sdk=$SYSROOT" 358 fi 356 359 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" 358 361 popd 359 362 popd 360 363 touch .already-built