[Libreoffice] [PATCH] Accept either 'amd64' or 'x86_64' in the platform id on FreeBSD

[Mike Eberdt]

Greetings,

Any config.guess from the last 5 years will identify FreeBSD on 64-bit X86 
as 'x86_64', but set_soenv.in recognizes only 'amd64'.  This is not a 
problem if one is building LO within the FreeBSD Ports environment 
(because an ancient config.guess that outputs 'amd64' will be silently 
substituted before configure is run).  The following patch allows one to 
configure LO outside of the FreeBSD Ports environment as well. 
Contributed under LGPL3+/MPL.

Thanks,
Mike Eberdt


---
  set_soenv.in |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/set_soenv.in b/set_soenv.in
index b632ee9..9a185df 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -323,7 +323,7 @@ elsif ( $platform =~ m/freebsd/ )
        $OS             = "FREEBSD";
        $PATH_SEPERATOR = $ps;
        $OSVERSION      = '@OSVERSION@';
-   if ($platform =~ m/^amd64/)
+   if ($platform =~ m/^(amd64|x86_64)/)
     {  my ( $JAVA_OS );
        print "Setting FreeBSD AMD64 specific values... ";
        $outfile        = "FreeBSDAMDEnv.Set.sh";
--
1.7.6