[Libreoffice-commits] core.git: desktop/source solenv/gbuild

Gleb Popov (via logerrit) logerrit at kemper.freedesktop.org
Thu Oct 22 09:00:51 UTC 2020


 desktop/source/deployment/misc/dp_platform.cxx  |    2 ++
 solenv/gbuild/platform/FREEBSD_POWERPC64_GCC.mk |   17 +++++++++++++++++
 solenv/gbuild/platform/FREEBSD_POWERPC_GCC.mk   |   16 ++++++++++++++++
 3 files changed, 35 insertions(+)

New commits:
commit d733db0165f3209b92dc84c16298e765823e0eef
Author:     Gleb Popov <6yearold at gmail.com>
AuthorDate: Wed Oct 21 13:47:17 2020 +0400
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Thu Oct 22 11:00:11 2020 +0200

    Add gbuild/platform/FREEBSD_POWERPC[64]_GCC.mk files.
    
    Add "freebsd_powerpc64" case to the checkOSandCPU switch in dp_platform.cxx.
    
    Change-Id: Iedee32ecb5b49ee99cd5cf7f8d7e0e33aef1c312
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104616
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 9e4fd320b39f..fb72d7d2b3ff 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -133,6 +133,8 @@ namespace
             ret = checkOSandCPU("FreeBSD", "X86_64");
         else if (token == "freebsd_powerpc")
             ret = checkOSandCPU("FreeBSD", "PowerPC");
+        else if (token == "freebsd_powerpc64")
+            ret = checkOSandCPU("FreeBSD", "PowerPC64");
         else if (token == "kfreebsd_x86")
             ret = checkOSandCPU("kFreeBSD", "x86");
         else if (token == "kfreebsd_x86_64")
diff --git a/solenv/gbuild/platform/FREEBSD_POWERPC64_GCC.mk b/solenv/gbuild/platform/FREEBSD_POWERPC64_GCC.mk
new file mode 100644
index 000000000000..93fdf8126b83
--- /dev/null
+++ b/solenv/gbuild/platform/FREEBSD_POWERPC64_GCC.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS += -DPPC -DPOWERPC64
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+gb_CXXFLAGS += -mminimal-toc
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/FREEBSD_POWERPC_GCC.mk b/solenv/gbuild/platform/FREEBSD_POWERPC_GCC.mk
new file mode 100644
index 000000000000..48c29b6f12c0
--- /dev/null
+++ b/solenv/gbuild/platform/FREEBSD_POWERPC_GCC.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+#please make generic modifications to unxgcc.mk or linux.mk
+gb_CPUDEFS += -DPPC -DPOWERPC
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:


More information about the Libreoffice-commits mailing list