You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2013/10/21 10:37:59 UTC
svn commit: r1534063 - in /openoffice/branches/rejuvenate01/main:
bridges/prj/d.lst desktop/source/deployment/misc/dp_platform.cxx
solenv/gbuild/platform/macosx.mk solenv/inc/tg_compv.mk
Author: jsc
Date: Mon Oct 21 08:37:58 2013
New Revision: 1534063
URL: http://svn.apache.org/r1534063
Log:
#122195# change cppu env, comid from generic cxx to s5abi (System 5 AMD64 ABI)
Modified:
openoffice/branches/rejuvenate01/main/bridges/prj/d.lst
openoffice/branches/rejuvenate01/main/desktop/source/deployment/misc/dp_platform.cxx
openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk
openoffice/branches/rejuvenate01/main/solenv/inc/tg_compv.mk
Modified: openoffice/branches/rejuvenate01/main/bridges/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/prj/d.lst?rev=1534063&r1=1534062&r2=1534063&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/bridges/prj/d.lst (original)
+++ openoffice/branches/rejuvenate01/main/bridges/prj/d.lst Mon Oct 21 08:37:58 2013
@@ -6,6 +6,6 @@
..\%__SRC%\bin\gcc3_uno.dll %_DEST%\bin%_EXT%\gcc3_uno.dll
..\%__SRC%\lib\libgcc2_uno.* %_DEST%\lib%_EXT%\libgcc2_uno.*
..\%__SRC%\lib\libgcc3_uno.* %_DEST%\lib%_EXT%\libgcc3_uno.*
-..\%__SRC%\lib\libcxx_uno.* %_DEST%\lib%_EXT%\libcxx_uno.*
+..\%__SRC%\lib\libs5abi_uno.* %_DEST%\lib%_EXT%\libs5abi_uno.*
..\%__SRC%\bin\gcc3_uno.* %_DEST%\bin%_EXT%\gcc3_uno.*
..\%__SRC%\lib\libsunpro5_uno.* %_DEST%\lib%_EXT%\libsunpro5_uno.*
Modified: openoffice/branches/rejuvenate01/main/desktop/source/deployment/misc/dp_platform.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/desktop/source/deployment/misc/dp_platform.cxx?rev=1534063&r1=1534062&r2=1534063&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/desktop/source/deployment/misc/dp_platform.cxx (original)
+++ openoffice/branches/rejuvenate01/main/desktop/source/deployment/misc/dp_platform.cxx Mon Oct 21 08:37:58 2013
@@ -59,6 +59,7 @@
#define PLATFORM_FREEBSD_X86 "freebsd_x86"
#define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64"
#define PLATFORM_MACOSX_X86 "macosx_x86"
+#define PLATFORM_MACOSX_X86_64 "macosx_x86_64"
#define PLATFORM_MACOSX_PPC "macosx_powerpc"
#define PLATFORM_OS2_X86 "os2_x86"
@@ -169,6 +170,8 @@ namespace
ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("X86_64"));
else if (token.equals(OUSTR(PLATFORM_MACOSX_X86)))
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86"));
+ else if (token.equals(OUSTR(PLATFORM_MACOSX_X86_64)))
+ ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86_64"));
else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC)))
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_OS2_X86)))
Modified: openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk?rev=1534063&r1=1534062&r2=1534063&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/gbuild/platform/macosx.mk Mon Oct 21 08:37:58 2013
@@ -22,8 +22,8 @@
GUI := UNX
-COM := CXX
-COMID := cxx
+COM := S5ABI
+COMID := s5abi
# Darwin mktemp -t expects a prefix, not a pattern
gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.
Modified: openoffice/branches/rejuvenate01/main/solenv/inc/tg_compv.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/solenv/inc/tg_compv.mk?rev=1534063&r1=1534062&r2=1534063&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/solenv/inc/tg_compv.mk (original)
+++ openoffice/branches/rejuvenate01/main/solenv/inc/tg_compv.mk Mon Oct 21 08:37:58 2013
@@ -130,8 +130,8 @@ COMNAME=MipsPro
.ENDIF
.IF "$(COM)"=="CLANG"
-COMID=cxx
-COMNAME=cxx
+COMID=s5abi
+COMNAME=s5abi
.ENDIF
.IF "$(COMNAME)"==""