Author: hdu
Date: Tue Nov 19 12:46:12 2013
New Revision: 1543407
URL: http://svn.apache.org/r1543407
Log:
#i122362# post-stlport fixes for the macosx-target=10.4 build
Modified:
openoffice/trunk/main/set_soenv.in
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
openoffice/trunk/main/solenv/inc/unxmacx.mk
Modified: openoffice/trunk/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1543407&r1=1543406&r2=1543407&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Tue Nov 19 12:46:12 2013
@@ -1444,8 +1444,7 @@ elsif ($platform =~ m/cygwin/)
}
elsif ($platform =~ m/darwin/)
{
- my $STLINC .=
$I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
- $SOLARINC .= $STLINC .
$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
+ $SOLARINC .= " " . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
}
else
{ AddWarning( "set_soenv", "$platform not configured for system dependant
include dir" );
@@ -1678,7 +1677,7 @@ if ( $platform =~ m/darwin/ )
# unless you want to do runtime checks for 10.5 api, you also want to use the
10.7 sdk
# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
# http://developer.apple.com/technotes/tn2002/tn2064.html
- ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.7", "e" );
+ ToFile( "MACOSX_DEPLOYMENT_TARGET", "10.4", "e" );
}
#
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1543407&r1=1543406&r2=1543407&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Tue Nov 19 12:46:12
2013
@@ -300,7 +300,7 @@ gb_Library_TARGETTYPEFLAGS := -dynamicli
gb_Library_SYSPRE := lib
gb_Library_UNOVERPRE := $(gb_Library_SYSPRE)uno_
gb_Library_PLAINEXT := .dylib
-gb_Library_RTEXT := $(COMID)$(gb_Library_PLAINEXT)
+gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
gb_Library_OOOEXT := $(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
Modified: openoffice/trunk/main/solenv/inc/unxmacx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxmacx.mk?rev=1543407&r1=1543406&r2=1543407&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxmacx.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxmacx.mk Tue Nov 19 12:46:12 2013
@@ -44,7 +44,6 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRAN
#.EXPORT: MACOSX_DEPLOYMENT_TARGET
CDEFS+=-DQUARTZ
EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk
-.ENDIF
# Name of library where static data members are initialized
# STATICLIBNAME=static$(DLLPOSTFIX)
