You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pe...@apache.org on 2015/09/26 00:45:55 UTC
svn commit: r1705370 - in /openoffice/branches/AOO410/main: ./ set_soenv.in
Author: pescetti
Date: Fri Sep 25 22:45:54 2015
New Revision: 1705370
URL: http://svn.apache.org/viewvc?rev=1705370&view=rev
Log:
#i125776# Adapt STL include path for Xcode 6.
Patch by: Juergen Schmidt <js...@apache.org>
Modified:
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/set_soenv.in
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 25 22:45:54 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main:1417739-1541842
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1700078,1700135,1702894,1702898,1702986,1702988,1705193,1705196,1705199,1705276
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1633294,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1695962,1700078,1700135,1702894,1702898,1702986,1702988,1705193,1705196,1705199,170527
6
Modified: openoffice/branches/AOO410/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/set_soenv.in?rev=1705370&r1=1705369&r2=1705370&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/set_soenv.in (original)
+++ openoffice/branches/AOO410/main/set_soenv.in Fri Sep 25 22:45:54 2015
@@ -1442,8 +1442,12 @@ elsif ($platform =~ m/darwin/)
{
$FRAMEWORKSHOME = "@MACOSX_SDK_PATH@/System/Library/Frameworks";
chomp( my $TOOLSPATH = `xcode-select --print-path` );
- my $STLINC .= $I."$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
- $SOLARINC .= $STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
+ my $STLINC = "$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/";
+ if ( !(-e $STLINC) && !(-d $STLINC) ) {
+ # Xcode 5
+ $STLINC = "$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
+ }
+ $SOLARINC .= $I.$STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
$GUIBASE = "aqua";
}
else