You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2009/02/15 00:46:16 UTC
svn commit: r744585 - in /harmony/enhanced:
classlib/trunk/make/properties.xml
common_resources/trunk/make/depends.properties
common_resources/trunk/make/properties.xml trunk/build.xml trunk/debian/rules
Author: ndbeyer
Date: Sat Feb 14 23:46:15 2009
New Revision: 744585
URL: http://svn.apache.org/viewvc?rev=744585&view=rev
Log:
Make libstdc++6 the default on Linux, add -Duse.libstdc++5=true enable v5
Modified:
harmony/enhanced/classlib/trunk/make/properties.xml
harmony/enhanced/common_resources/trunk/make/depends.properties
harmony/enhanced/common_resources/trunk/make/properties.xml
harmony/enhanced/trunk/build.xml
harmony/enhanced/trunk/debian/rules
Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=744585&r1=744584&r2=744585&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Sat Feb 14 23:46:15 2009
@@ -313,8 +313,8 @@
</condition>
<property name="hy.portlib.stubs" value="false" />
- <condition property="hy.libstdc++.suffix" value=".libstdc++6">
- <isset property="use.libstdc++6"/>
+ <condition property="hy.libstdc++.suffix" value=".libstdc++5">
+ <isset property="use.libstdc++5"/>
</condition>
<property name="hy.libstdc++.suffix" value="" />
Modified: harmony/enhanced/common_resources/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/depends.properties?rev=744585&r1=744584&r2=744585&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/depends.properties (original)
+++ harmony/enhanced/common_resources/trunk/make/depends.properties Sat Feb 14 23:46:15 2009
@@ -46,10 +46,10 @@
icuuc.linkname@unix@=libicuuc.so.34
icudll.md5@windows.x86@=4ab256e309d1ceb9779b10cf32c79dab
icudll.md5@windows.x86_64@=39b2bb43ec0ec6f31567fd020e2c5338
-icudll.md5@linux.x86@=545626f5c5336168005dad74d7f6f30c
-icudll.md5@linux.x86.libstdc++6@=efca3002eaa3e4727633eb096ad4561c
-icudll.md5@linux.x86_64@=dd65a5c4d519799607ce9463f7e5cd26
-icudll.md5@linux.x86_64.libstdc++6@=6467cbcb3c6ff979c7bf9495b62081af
+icudll.md5@linux.x86.libstdc++5@=545626f5c5336168005dad74d7f6f30c
+icudll.md5@linux.x86@=efca3002eaa3e4727633eb096ad4561c
+icudll.md5@linux.x86_64.libstdc++5@=dd65a5c4d519799607ce9463f7e5cd26
+icudll.md5@linux.x86_64@=6467cbcb3c6ff979c7bf9495b62081af
icudll.md5@linux.ia64@=1136e736ce8976da898f2a3d34cb8469
icudll.md5@linux.ppc32@=1a7e73cf283dc362b69350f163a3f256
icudll.md5@linux.ppc64@=d6d67c23093425b7a1adda1550944745
Modified: harmony/enhanced/common_resources/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/properties.xml?rev=744585&r1=744584&r2=744585&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/properties.xml (original)
+++ harmony/enhanced/common_resources/trunk/make/properties.xml Sat Feb 14 23:46:15 2009
@@ -69,8 +69,8 @@
<property name="hy.test.timeout" value="900000" />
<property name="hy.test.vmargs" value="" />
- <condition property="hy.platform.suffix" value=".libstdc++6">
- <isset property="use.libstdc++6"/>
+ <condition property="hy.platform.suffix" value=".libstdc++5">
+ <isset property="use.libstdc++5"/>
</condition>
<condition property="hy.platform.suffix" value=".7x">
<!-- matches would be better but debian stable has ant 1.6.5
Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=744585&r1=744584&r2=744585&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Sat Feb 14 23:46:15 2009
@@ -394,7 +394,7 @@
<propertyset id="required.props">
<propertyref name="hy.cfg" />
<propertyref name="hy.local.zlib" />
- <propertyref name="use.libstdc++6" />
+ <propertyref name="use.libstdc++5" />
</propertyset>
<target name="build-classlib" depends="auto-fetch-classlib-libs">
Modified: harmony/enhanced/trunk/debian/rules
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/rules?rev=744585&r1=744584&r2=744585&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/rules (original)
+++ harmony/enhanced/trunk/debian/rules Sat Feb 14 23:46:15 2009
@@ -12,8 +12,8 @@
# -lib /usr/share/java ensures that ant finds ecj.jar, etc
ANT_FLAGS = -lib /usr/share/java \
- -Duse.libstdc++6=true -Dhy.local.zlib=true \
- -Dhy.zip.api=false -Dhy.no.thr=false -Dauto.fetch=true
+ -Dhy.local.zlib=true -Dhy.zip.api=false \
+ -Dhy.no.thr=false -Dauto.fetch=true
JREDIR=$(CURDIR)/debian/harmony-5.0-jre
JDKDIR=$(CURDIR)/debian/harmony-5.0-jdk
HDKDIR=$(CURDIR)/debian/harmony-5.0-hdk