diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 17:04:00 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-26 17:04:00 +0000 |
| commit | 1885f7de91198ec0f751fe1061a2a9614ef0a2dc (patch) | |
| tree | 977e1dd401bad23e879eab9098016617b5a7eb2e /config_office | |
| parent | d19214925574d919095346c8535ab9d7cd7a8805 (diff) | |
INTEGRATION: CWS armoabiport01 (1.160.2); FILE MERGED
2007/11/07 14:23:37 cmc 1.160.2.1: #i83413# enable arm and use -a arm for .debs
Diffstat (limited to 'config_office')
| -rw-r--r-- | config_office/set_soenv.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in index 79f551f83c79..de2bb4fa8c44 100644 --- a/config_office/set_soenv.in +++ b/config_office/set_soenv.in @@ -1,8 +1,8 @@ #!@PERL@ -w # # Program: set_soenv.in -# Version: $Revision: 1.163 $ -# Date: $Date: 2007-11-26 12:47:08 $ +# Version: $Revision: 1.164 $ +# Date: $Date: 2007-11-26 18:04:00 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -504,7 +504,7 @@ elsif ( $platform =~ m/linux-gnu/ ) $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."client"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads"; } - elsif ($platform =~ m/^arm[45]l/) + elsif ($platform =~ m/^arm.*?l-/) { print "Setting Linux ARM specific values... "; $outfile = "LinuxARMEnv.Set"; $CPU = "R"; @@ -513,6 +513,7 @@ elsif ( $platform =~ m/linux-gnu/ ) $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm"; $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client"; $JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads"; + $EPM_FLAGS = "-a arm"; } elsif ($platform =~ m/^mips/) { print "Setting Linux MIPS specific values... "; |