openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1735014 - in /openoffice/branches/gbuild-reintegration: ./ main/source_soenv.sh
Date Tue, 15 Mar 2016 03:49:19 GMT
Author: damjan
Date: Tue Mar 15 03:49:18 2016
New Revision: 1735014

URL: http://svn.apache.org/viewvc?rev=1735014&view=rev
Log:
Merge from branches/gbuild:
* r1409606: gnumake4: #i117687#: source_soenv.sh: special treatment for x86_64 darwin
* r1409607: gnumake4: canvas: configure apparently sets ENABLE_CAIRO_CANVAS to FALSE...

Also updated FreeBSD handling in source_soenv.sh.

BUILDS

Build updates by: me


Modified:
    openoffice/branches/gbuild-reintegration/   (props changed)
    openoffice/branches/gbuild-reintegration/main/source_soenv.sh

Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 15 03:49:18 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409579,1409582,1409584,1409586-1409587,1409589-1409600,1409602,1409604-1409605
+/incubator/ooo/branches/gbuild:1409313-1409579,1409582,1409584,1409586-1409587,1409589-1409600,1409602,1409604-1409607
 /openoffice/branches/AOO400:1503684
 /openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
 /openoffice/branches/alg_writerframes:1556289-1579189

Modified: openoffice/branches/gbuild-reintegration/main/source_soenv.sh
URL: http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/source_soenv.sh?rev=1735014&r1=1735013&r2=1735014&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/source_soenv.sh (original)
+++ openoffice/branches/gbuild-reintegration/main/source_soenv.sh Tue Mar 15 03:49:18 2016
@@ -98,13 +98,11 @@ else
         i386-*-freebsd*)
             . ./FreeBSDX86Env.Set.sh
         ;;
-        amd64-*-freebsd*)
+        amd64-*-freebsd*|x86_64-*-freebsd*)
             . ./FreeBSDAMDEnv.Set.sh
         ;;
-        x86_64-*-freebsd*)
-            . ./FreeBSDAMDEnv.Set.sh
-        ;;
-        i[3456]86-*-darwin*)
+        # the result here (whether you get x86_64) seems to depend on $CC...
+        i[3456]86-*-darwin*|x86_64-*-darwin*)
             . ./MacOSXX86Env.Set.sh
         ;;
         powerpc-*-darwin*)



Mime
View raw message