openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r1777057 - in /openoffice/trunk/main: bridges/source/cpp_uno/gcc3_freebsd_arm/ set_soenv.in solenv/inc/unxfbsd.mk solenv/inc/unxfbsdr.mk
Date Tue, 03 Jan 2017 04:15:40 GMT
Author: pfg
Date: Tue Jan  3 04:15:40 2017
New Revision: 1777057

URL: http://svn.apache.org/viewvc?rev=1777057&view=rev
Log:
Initial support for the FreeBSD ARM platform.

This is just the skeleton, basically a copy of the linux support.
It wouldn't be surprising if it works without much trouble.

Added:
    openoffice/trunk/main/bridges/source/cpp_uno/gcc3_freebsd_arm/
      - copied from r1777055, openoffice/trunk/main/bridges/source/cpp_uno/gcc3_linux_arm/
    openoffice/trunk/main/solenv/inc/unxfbsdr.mk
      - copied, changed from r1777055, openoffice/trunk/main/solenv/inc/unxlngr.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=1777057&r1=1777056&r2=1777057&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Tue Jan  3 04:15:40 2017
@@ -397,6 +397,17 @@ 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/^arm.*?l-/)
+   {  print "Setting FreeBSD ARM specific values... ";
+      $outfile        = "FreeBSDARMEnv.Set"; 
+      $CPU            = "R";
+      $CPUNAME        = "ARM";
+      $OUTPATH        = "unxfbsdr";
+      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm";
+      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."server";
+      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
+      $EPM_FLAGS      = "-a arm";
+   }
    elsif ($platform =~ m/^powerpc/)
    {
       if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {

Modified: openoffice/trunk/main/solenv/inc/unxfbsd.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxfbsd.mk?rev=1777057&r1=1777056&r2=1777057&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxfbsd.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxfbsd.mk Tue Jan  3 04:15:40 2017
@@ -46,6 +46,9 @@ JAVAFLAGSDEBUG=-g
 .IF "$(CPUNAME)" == "POWERPC64"
 .INCLUDE : unxfbsdppc64.mk
 .ENDIF
+.IF "$(CPUNAME)" == "ARM"
+.INCLUDE : unxfbsdr.mk
+.ENDIF
 
 # filter for suppressing verbose messages from linker
 #not needed at the moment

Copied: openoffice/trunk/main/solenv/inc/unxfbsdr.mk (from r1777055, openoffice/trunk/main/solenv/inc/unxlngr.mk)
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxfbsdr.mk?p2=openoffice/trunk/main/solenv/inc/unxfbsdr.mk&p1=openoffice/trunk/main/solenv/inc/unxlngr.mk&r1=1777055&r2=1777057&rev=1777057&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxlngr.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxfbsdr.mk Tue Jan  3 04:15:40 2017
@@ -21,10 +21,10 @@
 
 
 
-# mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk
+# mk file for FreeBSD Unix ARM using GCC, please make generic modifications
+# to unxfbsd.mk
 
 CDEFAULTOPT=-Os
-.INCLUDE : unxlng.mk
 CDEFS+=-DARM32
 CFLAGS+=-fno-omit-frame-pointer
 DLLPOSTFIX=



Mime
View raw message