You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ge...@apache.org on 2006/11/17 04:36:39 UTC
svn commit: r476039 -
/incubator/harmony/enhanced/classlib/trunk/make/depends.xml
Author: geirm
Date: Thu Nov 16 19:36:38 2006
New Revision: 476039
URL: http://svn.apache.org/viewvc?view=rev&rev=476039
Log:
additional tweak for lcms for 64 bit linux
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=476039&r1=476038&r2=476039
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Thu Nov 16 19:36:38 2006
@@ -85,10 +85,24 @@
<!--
* FIXME : the following awful little hack is because we noticed that for whatever
- * reason, we can't link with libjpg.a on at least to kinds of 65-bit linux
+ * reason, we can't link with libjpg.a et al on at least to kinds of 64-bit linux
-->
<target name="-check-unix-common">
+
+ <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
+${line.separator}For Fedora try: yum install lcms-devel" />
+ <mkdir dir="depends/libs/build/lcms" />
+ <check-one-link src="${lcms.home}/include/icc34.h"
+ dest="depends/libs/build/lcms/icc34.h"
+ message="${lcms.msg}" />
+ <check-one-link src="${lcms.home}/include/lcms.h"
+ dest="depends/libs/build/lcms/lcms.h"
+ message="${lcms.msg}" />
+
<property name="png.msg"
value="libpng development package not installed
${line.separator}See depends/libs/build/README.txt for further details.
@@ -123,6 +137,10 @@
</target>
<target name="-check-unix-x86" if="is.x86" depends="-check-unix-common">
+ <check-one-link src="${lcms.home}/lib/liblcms.a"
+ dest="depends/libs/build/lcms/liblcms.${hy.platform}"
+ message="${lcms.msg}" />
+
<check-one-link src="${png.home}/lib/libpng.a"
dest="depends/libs/build/png/libpng.${hy.platform}"
message="${png.msg}" />
@@ -133,6 +151,10 @@
</target>
<target name="-check-unix-x86_64" if="is.x86_64" depends="-check-unix-common">
+ <check-one-link src="${lcms.home}/lib/liblcms.so"
+ dest="depends/libs/build/lcms/liblcms.${hy.platform}"
+ message="${lcms.msg}" />
+
<check-one-link src="${png.home}/lib/libpng.so"
dest="depends/libs/build/png/libpng.${hy.platform}"
message="${png.msg}" />
@@ -144,7 +166,7 @@
<target name="-check-unix" if="is.unix" depends="-check-unix-x86, -check-unix-x86_64">
- <property name="lcms.msg"
+<!-- <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
@@ -161,7 +183,7 @@
message="${lcms.msg}" />
- <!-- <property name="png.msg"
+ <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