Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Feb 2019 17:46:04 +0000 (UTC)
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r492260 - in head/editors/libreoffice: . files
Message-ID:  <201902051746.x15Hk4pJ035241@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: lwhsu
Date: Tue Feb  5 17:46:03 2019
New Revision: 492260
URL: https://svnweb.freebsd.org/changeset/ports/492260

Log:
  Add support for powerpc and powerpcspe
  
  PR:		234776
  Submitted by:	jhibbits

Added:
  head/editors/libreoffice/files/patch-powerpc
     - copied, changed from r492259, head/editors/libreoffice/files/patch-powerpc64
Deleted:
  head/editors/libreoffice/files/patch-powerpc64
Modified:
  head/editors/libreoffice/Makefile

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Tue Feb  5 17:42:21 2019	(r492259)
+++ head/editors/libreoffice/Makefile	Tue Feb  5 17:46:03 2019	(r492260)
@@ -279,6 +279,8 @@ CXXFLAGS_WARN=	-Woverloaded-virtual -Wno-unused-parame
 CXXFLAGS_WARN=	-Wshadow -Woverloaded-virtual
 .endif
 
+CXXFLAGS_powerpcspe=	-D__NO_FPRS
+
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	    ${WRKSRC}/shell/source/unix/exec/shellexec.cxx

Copied and modified: head/editors/libreoffice/files/patch-powerpc (from r492259, head/editors/libreoffice/files/patch-powerpc64)
==============================================================================
--- head/editors/libreoffice/files/patch-powerpc64	Tue Feb  5 17:42:21 2019	(r492259, copy source)
+++ head/editors/libreoffice/files/patch-powerpc	Tue Feb  5 17:46:03 2019	(r492260)
@@ -1,20 +1,25 @@
---- configure.ac.orig
-+++ configure.ac
-@@ -4189,6 +4189,11 @@
-         CPUNAME=X86_64
+--- configure.ac.old	2018-12-30 15:36:04.692353000 -0600
++++ configure.ac	2018-12-30 15:37:39.225930000 -0600
+@@ -3981,6 +3981,16 @@
          RTL_ARCH=X86_64
          PLATFORMID=freebsd_x86_64
-+        ;;
+         ;;
 +    powerpc64)
 +        CPUNAME=POWERPC64
 +        RTL_ARCH=PowerPC_64
 +        PLATFORMID=freebsd_powerpc64
-         ;;
++        ;;
++    powerpc|powerpcspe)
++        CPUNAME=POWERPC
++        RTL_ARCH=PowerPC
++        PLATFORMID=freebsd_powerpc
++        ;;
      *)
          AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
---- configure.orig
-+++ configure
-@@ -10936,6 +10936,11 @@
+         ;;
+--- configure.old	2018-12-30 15:33:12.582597000 -0600
++++ configure	2018-12-30 15:35:48.424447000 -0600
+@@ -11511,6 +11511,16 @@
          RTL_ARCH=X86_64
          PLATFORMID=freebsd_x86_64
          ;;
@@ -23,9 +28,28 @@
 +        RTL_ARCH=PowerPC_64
 +        PLATFORMID=freebsd_powerpc64
 +        ;;
++    powerpc|powerpcspe)
++        CPUNAME=POWERPC
++        RTL_ARCH=PowerPC
++        PLATFORMID=freebsd_powerpc
++        ;;
      *)
          as_fn_error $? "Unsupported host_cpu $host_cpu for host_os $host_os" "$LINENO" 5
          ;;
+--- bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx.orig
++++ bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+@@ -18,7 +18,11 @@
+  */
+ 
+ 
++#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY)
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ 
+ #include <com/sun/star/uno/genfunc.hxx>
+ #include <uno/data.h>
 --- bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx.orig
 +++ bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
 @@ -18,7 +18,11 @@
@@ -56,6 +80,25 @@
  #       define OSL_BIGENDIAN
  #   endif
  #elif defined AIX
+--- /dev/null
++++ 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:
 --- /dev/null
 +++ solenv/gbuild/platform/FREEBSD_POWERPC64_GCC.mk
 @@ -0,0 +1,17 @@



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902051746.x15Hk4pJ035241>