You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2014/07/06 18:56:22 UTC
svn commit: r1608245 - in /openoffice/trunk/main:
bridges/source/cpp_uno/gcc3_freebsd_powerpc/
bridges/source/cpp_uno/gcc3_freebsd_powerpc64/ set_soenv.in
solenv/inc/unxfbsd.mk solenv/inc/unxfbsdppc.mk solenv/inc/unxfbsdppc64.mk
Author: pfg
Date: Sun Jul 6 16:56:22 2014
New Revision: 1608245
URL: http://svn.apache.org/r1608245
Log:
Add initial support for FreeBSD PPC using gcc.
This is just the skeleton and required bridge support based
on linux-ppc. Currently untested.
Added:
openoffice/trunk/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/
- copied from r1607706, openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_powerpc/
openoffice/trunk/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/
- copied from r1607706, openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_powerpc64/
openoffice/trunk/main/solenv/inc/unxfbsdppc.mk
- copied, changed from r1608233, openoffice/trunk/main/solenv/inc/unxlngppc.mk
openoffice/trunk/main/solenv/inc/unxfbsdppc64.mk
- copied, changed from r1608233, openoffice/trunk/main/solenv/inc/unxlngppc64.mk
Modified:
openoffice/trunk/main/set_soenv.in
openoffice/trunk/main/solenv/inc/unxfbsd.mk
Modified: openoffice/trunk/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1608245&r1=1608244&r2=1608245&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Sun Jul 6 16:56:22 2014
@@ -397,6 +397,46 @@ elsif ( $platform =~ m/freebsd/ )
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
}
+ elsif ($platform =~ m/^powerpc/)
+ {
+ if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
+ print "Setting FreeBSD PPC64 specific values... ";
+ $outfile = "FreeBSDPPC64Env.Set";
+ $OUTPATH = "unxfbsdppc64";
+ $CPUNAME = "POWERPC64";
+
+ if ( $JDK eq "gcj" ) {
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc64".$ds."native_threads";
+ }
+ }
+ else {
+ print "Setting FreeBSD PPC specific values... ";
+ $outfile = "FreeBSDPPCEnv.Set";
+ $OUTPATH = "unxlngppc";
+ $CPUNAME = "POWERPC";
+
+ if ( $JDK eq "gcj" ) {
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
+ elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
+ { $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+ }
+ # OpenJDK
+ elsif ($JDK =~ m/sun/) {
+ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."server";
+ $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+ }
+ }
+
+ $CPU = "P";
+
+ }
else
{ print "Unsupported FreeBSD architecture: $platform \n";
exit 1;
Modified: openoffice/trunk/main/solenv/inc/unxfbsd.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxfbsd.mk?rev=1608245&r1=1608244&r2=1608245&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxfbsd.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxfbsd.mk Sun Jul 6 16:56:22 2014
@@ -37,6 +37,12 @@ JAVAFLAGSDEBUG=-g
.IF "$(CPUNAME)" == "X86_64"
.INCLUDE : unxfbsdx.mk
.ENDIF
+.IF "$(CPUNAME)" == "POWERPC"
+.INCLUDE : unxfbsdppc.mk
+.ENDIF
+.IF "$(CPUNAME)" == "POWERPC64"
+.INCLUDE : unxfbsdppc64.mk
+.ENDIF
# filter for suppressing verbose messages from linker
#not needed at the moment
Copied: openoffice/trunk/main/solenv/inc/unxfbsdppc.mk (from r1608233, openoffice/trunk/main/solenv/inc/unxlngppc.mk)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxfbsdppc.mk?p2=openoffice/trunk/main/solenv/inc/unxfbsdppc.mk&p1=openoffice/trunk/main/solenv/inc/unxlngppc.mk&r1=1608233&r2=1608245&rev=1608245&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxlngppc.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxfbsdppc.mk Sun Jul 6 16:56:22 2014
@@ -21,10 +21,10 @@
-# mk file for Unix Linux PowerPC using GCC, please make generic modifications to unxlng.mk
+# mk file for Unix FreeBSD PowerPC using GCC, please make generic
+# modifications to unxfbsd.mk
DEFAULTOPT=-Os
PICSWITCH:=-fPIC
-.INCLUDE : unxlng.mk
CDEFS+=-DPOWERPC -DPPC
DLLPOSTFIX=
Copied: openoffice/trunk/main/solenv/inc/unxfbsdppc64.mk (from r1608233, openoffice/trunk/main/solenv/inc/unxlngppc64.mk)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxfbsdppc64.mk?p2=openoffice/trunk/main/solenv/inc/unxfbsdppc64.mk&p1=openoffice/trunk/main/solenv/inc/unxlngppc64.mk&r1=1608233&r2=1608245&rev=1608245&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxlngppc64.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxfbsdppc64.mk Sun Jul 6 16:56:22 2014
@@ -21,9 +21,10 @@
-# mk file for Unix Linux 64Bit PowerPC using GCC, inherit from ppc and add some flags
+# mk file for Unix FreeBSD 64Bit PowerPC using GCC, inherit from
+# ppc and add some flags
-.INCLUDE : unxlngppc.mk
+.INCLUDE : unxfbsdppc.mk
CDEFS+=-DPOWERPC64
CFLAGSCXX+=-mminimal-toc