harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r601732 - /harmony/enhanced/classlib/trunk/make/depends.xml
Date Thu, 06 Dec 2007 13:39:07 GMT
Author: varlax
Date: Thu Dec  6 05:39:01 2007
New Revision: 601732

URL: http://svn.apache.org/viewvc?rev=601732&view=rev
Log:
try looking awt dependencies also in /usr/lib64 (SLES10 does not have them in /usr/lib/)

Modified:
    harmony/enhanced/classlib/trunk/make/depends.xml

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=601732&r1=601731&r2=601732&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Thu Dec  6 05:39:01 2007
@@ -237,15 +237,24 @@
     </target>
 
     <target name="-check-unix-x86_64" if="is.x86_64" unless="is.windows" depends="-check-unix-common">
-        <check-one-link src="${lcms.home}/lib/liblcms.so"
+        <condition property="lcms.lib.home" value="${lcms.home}/lib64" else="${lcms.home}/lib">
+            <available file="${lcms.home}/lib64/liblcms.so"/>
+        </condition>
+        <check-one-link src="${lcms.lib.home}/liblcms.so"
                         dest="depends/libs/build/lcms/liblcms.${hy.platform}"
                         message="${lcms.msg}" />
 
-        <check-one-link src="${png.home}/lib/libpng.so"
+        <condition property="png.lib.home" value="${png.home}/lib64" else="${png.home}/lib">
+            <available file="${png.home}/lib64/libpng.so"/>
+        </condition>
+        <check-one-link src="${png.lib.home}/libpng.so"
                         dest="depends/libs/build/png/libpng.${hy.platform}"
                         message="${png.msg}" />
 
-        <check-one-link src="${jpeg.home}/lib/libjpeg.so"
+        <condition property="jpeg.lib.home" value="${jpeg.home}/lib64" else="${jpeg.home}/lib">
+            <available file="${jpeg.home}/lib64/libjpeg.so"/>
+        </condition>
+        <check-one-link src="${jpeg.lib.home}/libjpeg.so"
                         dest="depends/libs/build/jpeg/libjpeg.${hy.platform}"
                         message="${jpeg.msg}" />
     </target>



Mime
View raw message