You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by gs...@apache.org on 2007/02/12 23:23:25 UTC
svn commit: r506704 - in /harmony/enhanced/drlvm/trunk/build/make:
components/vm/vmcore.xml targets/cunit.test.xml
Author: gshimansky
Date: Mon Feb 12 14:23:24 2007
New Revision: 506704
URL: http://svn.apache.org/viewvc?view=rev&rev=506704
Log:
Fixed IPF build after HARMONY-3133 has been applied. Tests work ok now on SuSE9
Modified:
harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
Modified: harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml?view=diff&rev=506704&r1=506703&r2=506704
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml Mon Feb 12 14:23:24 2007
@@ -277,7 +277,13 @@
resource="${external.dep.CLASSLIB}/depends/libs/linux.x86_64/libicuuc.so.34"/>
<symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/linux.x86_64/libicudata.so"
resource="${external.dep.CLASSLIB}/depends/libs/linux.x86_64/libicudata.so.34"/>
- </select>
+ </select>
+ <select arch="ipf">
+ <symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/linux.ia64/libicuuc.so"
+ resource="${external.dep.CLASSLIB}/depends/libs/linux.ia64/libicuuc.so.34"/>
+ <symlink overwrite="yes" link="${external.dep.CLASSLIB}/depends/libs/linux.ia64/libicudata.so"
+ resource="${external.dep.CLASSLIB}/depends/libs/linux.ia64/libicudata.so.34"/>
+ </select>
</select>
<linker id="linker" extends="common.linker">
@@ -329,7 +335,11 @@
<select arch="em64t">
<libset type="shared" libs="icuuc"
dir="${external.dep.CLASSLIB}/depends/libs/linux.x86_64" />
- </select>
+ </select>
+ <select arch="ipf">
+ <libset type="shared" libs="icuuc"
+ dir="${external.dep.CLASSLIB}/depends/libs/linux.ia64" />
+ </select>
<!--linkerarg value="-lz" />
<linkerarg value="-lxml2" />
<linkerarg value="-lm" />
Modified: harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml?view=diff&rev=506704&r1=506703&r2=506704
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml Mon Feb 12 14:23:24 2007
@@ -156,7 +156,13 @@
dir="${external.dep.CLASSLIB}/depends/libs/linux.x86_64" />
<libset type="shared" libs="icudata"
dir="${external.dep.CLASSLIB}/depends/libs/linux.x86_64" />
- </select>
+ </select>
+ <select arch="ipf">
+ <libset type="shared" libs="icuuc"
+ dir="${external.dep.CLASSLIB}/depends/libs/linux.ia64" />
+ <libset type="shared" libs="icudata"
+ dir="${external.dep.CLASSLIB}/depends/libs/linux.ia64" />
+ </select>
</select>
</linker>
</cc>