[oe-commits] org.oe.dev classpath: fix compilation failure of classpath-gtk_cvs. Closes 2519.

[Laibsch commit]

classpath: fix compilation failure of classpath-gtk_cvs.  Closes 2519.
* add libxtst to DEPENDS
* fix packaging
* move stuff to *.inc (unify)

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: aeb3d1a31886bb45c060d3b140ac77e547c26e46
ViewMTN: http://monotone.openembedded.org/revision.psp?id=aeb3d1a31886bb45c060d3b140ac77e547c26e46
Files:
1
packages/classpath/classpath-gtk_cvs.bb
packages/classpath/classpath.inc
Diffs:

#
# mt diff -ra88190de9e52c22c4f364eb2588f33fe6c5b18a5 -raeb3d1a31886bb45c060d3b140ac77e547c26e46
#
# 
# 
# patch "packages/classpath/classpath-gtk_cvs.bb"
#  from [9c075975c67e938dedff4295c97b600faa1fc2ba]
#    to [4b43f8aa3270e64a9e31f2583dccdcf3d0d28735]
# 
# patch "packages/classpath/classpath.inc"
#  from [ae11b48d7711660b9bb1582d94c521e81df3a68b]
#    to [9ccf64cc6c824d5135c1c6bdfb1ebe5988852670]
# 
============================================================
--- packages/classpath/classpath-gtk_cvs.bb	9c075975c67e938dedff4295c97b600faa1fc2ba
+++ packages/classpath/classpath-gtk_cvs.bb	4b43f8aa3270e64a9e31f2583dccdcf3d0d28735
@@ -1,12 +1,12 @@ require classpath.inc
 require classpath.inc
 
-PR = "r1"
+PR = "r2"
 
 SRCDATE_${PN} ?= "20070501"
 PV = "0.93+cvs${SRCDATE}"
 
 ### note from Laibsch: bug 2523 has information on how to build this package
-DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native"
+DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native libxtst"
 RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
@@ -17,15 +17,6 @@ EXTRA_OECONF = "--with-ecj=${STAGING_BIN
 
 EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin --disable-dssi --disable-alsa"
 
-PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}"
-
-FILES_classpath-doc = "${datadir}/info ${datadir}/man"
-FILES_classpath-dev = "${includedir}"
-FILES_${PN} = "${libdir} ${bindir}"
-FILES_classpath-common = "${datadir}/classpath/glibj.zip"
-FILES_classpath-examples = "${datadir}/classpath/examples"
-FILES_classpath-tools = "${datadir}/classpath/tools.zip"
-
 do_stage() {
 	install -d ${STAGING_INCDIR}/classpath
 	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
============================================================
--- packages/classpath/classpath.inc	ae11b48d7711660b9bb1582d94c521e81df3a68b
+++ packages/classpath/classpath.inc	9ccf64cc6c824d5135c1c6bdfb1ebe5988852670
@@ -28,3 +28,16 @@ FILES_classpath-dev += "${libdir}/*.so"
 FILES_classpath-examples += "${datadir}/classpath/examples"
 FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools"
 FILES_classpath-dev += "${libdir}/*.so"
+FILES_classpath-dbg += "${libdir}/classpath/.debug"
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/classpath
+	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
+	install -d ${STAGING_DATADIR}/classpath
+	install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/
+}
+
+do_install() {
+	autotools_do_install
+	mv ${D}${libdir}/security ${D}${libdir}/${PN}
+}