harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r452910 - /incubator/harmony/enhanced/classlib/trunk/make/depends.xml
Date Wed, 04 Oct 2006 15:14:01 GMT
Author: hindessm
Date: Wed Oct  4 08:14:01 2006
New Revision: 452910

URL: http://svn.apache.org/viewvc?view=rev&rev=452910
Log:
Quick hack until we sort out the awt architecture variables.

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

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=452910&r1=452909&r2=452910
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Wed Oct  4 08:14:01 2006
@@ -90,12 +90,18 @@
 
     <target name="-check-unix" if="is.unix">
         
+        <condition property="hack.arch" value="ipf">
+            <isset property="is.x86_64" />
+        </condition>
+        <property name="hack.arch" value="ia32" />
+
         <property name="lcms.msg"
                   value="liblcms development package not installed
+${line.separator}See depends/libs/build/README.txt for further details.
 ${line.separator}For Debian/Ubuntu try: apt-get install liblcms1-dev" />
         <mkdir dir="depends/libs/build/lcms" />
         <check-one-link src="${lcms.home}/lib/liblcms.a"
-                        dest="depends/libs/build/lcms/liblcms.ia32"
+                        dest="depends/libs/build/lcms/liblcms.${hack.arch}"
                         message="${lcms.msg}" />
         <check-one-link src="${lcms.home}/include/icc34.h"
                         dest="depends/libs/build/lcms/icc34.h"
@@ -107,10 +113,11 @@
 
         <property name="png.msg"
                   value="libpng development package not installed
+${line.separator}See depends/libs/build/README.txt for further details.
 ${line.separator}For Debian/Ubuntu try: apt-get install libpng12-dev" />
         <mkdir dir="depends/libs/build/png" />
         <check-one-link src="${png.home}/lib/libpng.a"
-                        dest="depends/libs/build/png/libpng.ia32"
+                        dest="depends/libs/build/png/libpng.${hack.arch}"
                         message="${png.msg}" />
         <check-one-link src="${png.home}/include/pngconf.h"
                         dest="depends/libs/build/png/pngconf.h"
@@ -122,10 +129,11 @@
 
         <property name="jpeg.msg"
                   value="libjpeg development package not installed
+${line.separator}See depends/libs/build/README.txt for further details.
 ${line.separator}For Debian/Ubuntu try: apt-get install libjpeg62-dev" />
         <mkdir dir="depends/libs/build/jpeg" />
         <check-one-link src="${jpeg.home}/lib/libjpeg.a"
-                        dest="depends/libs/build/jpeg/libjpeg.ia32"
+                        dest="depends/libs/build/jpeg/libjpeg.${hack.arch}"
                         message="${jpeg.msg}" />
         <check-one-link src="${jpeg.home}/include/jconfig.h"
                         dest="depends/libs/build/jpeg/jconfig.lnx"



Mime
View raw message