[oe-commits] org.oe.dev kaffe: move common dependency on libart-lgpl into include file

[Laibsch commit]

kaffe: move common dependency on libart-lgpl into include file

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: f3b849d9629cef2bbbdc3d8614f6febdde792fb1
ViewMTN: http://monotone.openembedded.org/revision/info/f3b849d9629cef2bbbdc3d8614f6febdde792fb1
Files:
1
packages/kaffe/kaffe-gtk_1.1.5.bb
packages/kaffe/kaffe-gtk_cvs.bb
packages/kaffe/kaffe.inc
Diffs:

#
# mt diff -r09f5c53172e04888c1ddd8d40e8b65dcf90def81 -rf3b849d9629cef2bbbdc3d8614f6febdde792fb1
#
# 
# 
# patch "packages/kaffe/kaffe-gtk_1.1.5.bb"
#  from [4cf619038cb440e82ed3ff405c8cfc356e88b429]
#    to [42884404e31df924361ebe0025d4fd326dbbeabf]
# 
# patch "packages/kaffe/kaffe-gtk_cvs.bb"
#  from [32c062afe9402e549b7dff41c29df11508f4f86e]
#    to [926fac7920e29f780d076a4fb26fe326d3f9a767]
# 
# patch "packages/kaffe/kaffe.inc"
#  from [c70b26fefad40202641d870f47a07b865e944e77]
#    to [c88d746cc49eac01a7b3f3f7cce27aed48398f03]
# 
============================================================
--- packages/kaffe/kaffe-gtk_1.1.5.bb	4cf619038cb440e82ed3ff405c8cfc356e88b429
+++ packages/kaffe/kaffe-gtk_1.1.5.bb	42884404e31df924361ebe0025d4fd326dbbeabf
@@ -1,9 +1,9 @@ require kaffe.inc
 
 SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz"
 S = "${WORKDIR}/kaffe-${PV}"
 
 require kaffe.inc
 
-DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib libxtst kaffeh-native"
+DEPENDS += "glib-2.0 gmp gtk+ pango zlib libxtst kaffeh-native"
 
 EXTRA_OECONF += ""
============================================================
--- packages/kaffe/kaffe-gtk_cvs.bb	32c062afe9402e549b7dff41c29df11508f4f86e
+++ packages/kaffe/kaffe-gtk_cvs.bb	926fac7920e29f780d076a4fb26fe326d3f9a767
@@ -7,6 +7,6 @@ require kaffe.inc
 
 require kaffe.inc
 
-DEPENDS += "glib-2.0 gmp gtk+ libart-lgpl pango zlib libxtst kaffeh-native"
+DEPENDS += "glib-2.0 gmp gtk+ pango zlib libxtst kaffeh-native"
 
 EXTRA_OECONF += ""
============================================================
--- packages/kaffe/kaffe.inc	c70b26fefad40202641d870f47a07b865e944e77
+++ packages/kaffe/kaffe.inc	c88d746cc49eac01a7b3f3f7cce27aed48398f03
@@ -1,8 +1,8 @@ LICENSE  = "GPL LGPL W3C Classpath BSD"
 DESCRIPTION = "Kaffe is a clean room implementation of the Java Virtual Machine"
 HOMEPAGE = "http://www.kaffe.org/"
 LICENSE  = "GPL LGPL W3C Classpath BSD"
 
-DEPENDS = "virtual/javac-native fastjar-native libffi zip-native"
+DEPENDS = "virtual/javac-native fastjar-native libffi zip-native libart-lgpl"
 RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
 
 SRC_URI += "file://disable-automake-checks.patch;patch=1"
@@ -44,10 +44,6 @@ oe_runconf () {
 	fi
 }
 
-PACKAGES =+ "${PN}-common"
-FILES_${PN} += "${libdir}/${PN}"
-FILES_${PN}-common = "${libdir}/${PN}/jre/lib/*.jar"
-
 do_install () {
 	autotools_do_install
 
@@ -84,3 +80,7 @@ pkg_postrm_${PN} () {
 		update-alternatives --remove $name ${libdir}/${PN}/jre/bin/$name
 	done
 }
+
+PACKAGES =+ "${PN}-common"
+FILES_${PN} += "${libdir}/${PN}"
+FILES_${PN}-common = "${libdir}/${PN}/jre/lib/*.jar"