[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bridges/prj desktop/source
Pedro Giffuni
pfg at apache.org
Wed Nov 25 14:08:25 PST 2015
bridges/prj/build.lst | 2 ++
desktop/source/deployment/misc/dp_platform.cxx | 3 +++
2 files changed, 5 insertions(+)
New commits:
commit abb9cd92ab4614d606df8ced0d57916dcb04289c
Author: Pedro Giffuni <pfg at apache.org>
Date: Wed Nov 25 21:52:49 2015 +0000
i126615 - Allow build of Open Office on FreeBSD Mac PowerPCG5
These appear to have been missed from r1608245.
Brave attempt by: Curtis Hamilton
diff --git a/bridges/prj/build.lst b/bridges/prj/build.lst
index 4651b6a..914eb63 100644
--- a/bridges/prj/build.lst
+++ b/bridges/prj/build.lst
@@ -9,6 +9,8 @@ br bridges\source\cpp_uno\gcc3_os2_intel nmake - p br_gcc3os br_cppuno_shared br
br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u br_gcc3fi br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_x86-64 nmake - u br_gcc3lx br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_freebsd_x86-64 nmake - u br_gcc3fx br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_powerpc nmake - u br_gcc3fp br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_powerpc64 nmake - u br_gcc3fp_64 br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_powerpc nmake - u br_gcc3lp br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_mips nmake - u br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 3b04bed..06ab402 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -56,6 +56,7 @@
#define PLATFORM_SOLARIS_SPARC "solaris_sparc"
#define PLATFORM_SOLARIS_SPARC64 "solaris_sparc64"
#define PLATFORM_SOLARIS_X86 "solaris_x86"
+#define PLATFORM_FREEBSD_POWERPC "freebsd_powerpc"
#define PLATFORM_FREEBSD_X86 "freebsd_x86"
#define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64"
#define PLATFORM_MACOSX_X86 "macosx_x86"
@@ -164,6 +165,8 @@ namespace
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC64"));
else if (token.equals(OUSTR(PLATFORM_SOLARIS_X86)))
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("x86"));
+ else if (token.equals(OUSTR(PLATFORM_FREEBSD_POWERPC)))
+ ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86)))
ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86_64)))
More information about the Libreoffice-commits
mailing list