harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r948847 - in /harmony/enhanced/java/trunk: debian/control drlvm/make/vm/em.xml drlvm/make/vm/vmcore.xml
Date Thu, 27 May 2010 14:26:21 GMT
Author: hindessm
Date: Thu May 27 14:26:21 2010
New Revision: 948847

URL: http://svn.apache.org/viewvc?rev=948847&view=rev
Log:
Remove libxml2 references since we don't actually seem to be using it???

Modified:
    harmony/enhanced/java/trunk/debian/control
    harmony/enhanced/java/trunk/drlvm/make/vm/em.xml
    harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml

Modified: harmony/enhanced/java/trunk/debian/control
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/debian/control?rev=948847&r1=948846&r2=948847&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/debian/control (original)
+++ harmony/enhanced/java/trunk/debian/control Thu May 27 14:26:21 2010
@@ -2,7 +2,7 @@ Source: harmony-5.0
 Section: devel
 Priority: extra
 Maintainer: Mark Hindess <mark.hindess@googlemail.com>
-Build-Depends: debhelper (>= 5), ecj-bootstrap | libecj-java, junit, ant (>= 1.7.0),
subversion, ant-optional, liblcms1-dev, libjpeg62-dev, libpng-dev, libxft-dev, libxml2-dev,
libxtst-dev, libxext-dev
+Build-Depends: debhelper (>= 5), ecj-bootstrap | libecj-java, junit, ant (>= 1.7.0),
subversion, ant-optional, liblcms1-dev, libjpeg62-dev, libpng-dev, libxft-dev, libxtst-dev,
libxext-dev
 Standards-Version: 3.7.2
 
 Package: harmony-5.0-drlvm

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/em.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/em.xml?rev=948847&r1=948846&r2=948847&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/em.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/em.xml Thu May 27 14:26:21 2010
@@ -46,9 +46,8 @@
             <libset libs="harmonyvm,hythr" dir="${drlvm.shlib.dir}" />
             <libset libs="port,apr-1" dir="${drlvm.lib.dir}" />
             
-            <syslibset type="shared" libs="m,dl,stdc++,z,xml2,pthread" if="is.linux"/>
+            <syslibset type="shared" libs="m,dl,stdc++,z,pthread" if="is.linux"/>
             <syslibset type="shared" libs="m,stdc++,z,pthread" if="is.freebsd"/>
-            <libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>
             <linkerarg value="--export-dynamic" if="is.freebsd"/>
             
             <linkerarg value="--version-script=${vm.home}/em/build/em.exp" if="is.unix"/>

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml?rev=948847&r1=948846&r2=948847&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml Thu May 27 14:26:21 2010
@@ -195,9 +195,8 @@
                 <linkerarg value="/DEF:${vm.home}/vmcore/src/harmonyvm.def" if="is.windows.x86"/>
                 <linkerarg value="--version-script=${vm.home}/vmcore/build/vmcore.exp"
if="is.unix"/>
                 
-                <syslibset type="shared" libs="m,dl,stdc++,xml2,pthread,gcc_s,rt" if="is.linux"/>
+                <syslibset type="shared" libs="m,dl,stdc++,pthread,gcc_s,rt" if="is.linux"/>
                 <syslibset type="shared" libs="m,stdc++,pthread" if="is.freebsd"/>

-                <libset libs="xml2" dir="/usr/local/lib" if="is.freebsd"/>
                 <linkerarg value="--export-dynamic" if="is.freebsd"/>
             </linker>
         </link-lib>        



Mime
View raw message