From cd93cd62db9b4462932ef66a00f163d3286b2a34 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Wed, 23 May 2007 19:16:48 +0000
Subject: classpath: update from Andrew Paulsen. partly closes 2296. * update
 classpath-gtk. fix $PN-issue. * add classpath-gtk_cvs * add
 classpath-minimal-native

---
 packages/classpath/classpath-gtk_0.90.bb           | 16 --------
 packages/classpath/classpath-gtk_0.93.bb           | 16 ++++++++
 packages/classpath/classpath-gtk_cvs.bb            | 45 ++++++++++++++++++++++
 .../classpath/classpath-minimal-native_0.93.bb     | 17 ++++++++
 packages/classpath/classpath.inc                   |  2 +-
 packages/classpath/files/gconf_version.patch       | 11 ++++++
 6 files changed, 90 insertions(+), 17 deletions(-)
 delete mode 100644 packages/classpath/classpath-gtk_0.90.bb
 create mode 100644 packages/classpath/classpath-gtk_0.93.bb
 create mode 100644 packages/classpath/classpath-gtk_cvs.bb
 create mode 100644 packages/classpath/classpath-minimal-native_0.93.bb
 create mode 100644 packages/classpath/files/gconf_version.patch

(limited to 'packages/classpath')

diff --git a/packages/classpath/classpath-gtk_0.90.bb b/packages/classpath/classpath-gtk_0.90.bb
deleted file mode 100644
index b83d23d9c0..0000000000
--- a/packages/classpath/classpath-gtk_0.90.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require classpath.inc
-
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
-RDEPENDS_${PBN}-gtk = "${PBN}-common (>= ${PV})"
-RCONFLICTS_${PBN}-gtk = "${PBN}-minimal"
-
-EXTRA_OECONF = "--with-jikes"
-
-PACKAGES = "${PBN}-dev ${PBN}-doc ${PBN}-common ${PBN}-examples ${PBN}-tools ${PN}"
-
-FILES_${PBN}-doc = "${datadir}/info"
-FILES_${PBN}-dev = "${includedir}"
-FILES_${PN} = "${libdir}"
-FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip"
-FILES_${PBN}-examples = "${datadir}/${PBN}/examples"
-FILES_${PBN}-tools = "${datadir}/${PBN}/tools"
diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb
new file mode 100644
index 0000000000..9577947a0c
--- /dev/null
+++ b/packages/classpath/classpath-gtk_0.93.bb
@@ -0,0 +1,16 @@
+require classpath.inc
+
+DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-native"
+RDEPENDS_${PN} = "classpath-common (>= ${PV})"
+RCONFLICTS_${PN} = "classpath-minimal"
+
+EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi"
+
+PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}"
+
+FILES_classpath-doc = "${datadir}/info"
+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"
diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb
new file mode 100644
index 0000000000..111f1bf6b8
--- /dev/null
+++ b/packages/classpath/classpath-gtk_cvs.bb
@@ -0,0 +1,45 @@
+DESCRIPTION = "GNU Classpath standard Java libraries"
+HOMEPAGE = "http://www.gnu.org/software/classpath/"
+LICENSE = "Classpath"
+PRIORITY = "optional"
+SECTION = "libs"
+
+SRCDATE_${PN} ?= "20070501"
+PV = "0.93+cvs${SRCDATE}"
+
+DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native"
+RDEPENDS_${PN} = "classpath-common (>= ${PV})"
+RCONFLICTS_${PN} = "classpath-minimal"
+
+SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpath \
+           file://disable-automake-checks.patch;patch=1"
+
+S = "${WORKDIR}/classpath"
+
+inherit autotools
+
+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/
+	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}
+}
+
+PROVIDES = "classpath"
+RPROVIDES = "classpath"
diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb
new file mode 100644
index 0000000000..05fd9b8557
--- /dev/null
+++ b/packages/classpath/classpath-minimal-native_0.93.bb
@@ -0,0 +1,17 @@
+inherit native
+require classpath.inc
+
+DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
+
+EXTRA_OECONF = "--with-jikes --disable-gconf-peer --disable-gtk-peer --disable-plugin --disable-dssi --disable-examples"
+
+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() {
+	:
+}
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index 303c286d4e..459788c93a 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -8,7 +8,7 @@ PBN = "classpath"
 
 SRC_URI = "${GNU_MIRROR}/classpath/${PBN}-${PV}.tar.gz \
            file://disable-automake-checks.patch;patch=1 \
-           file://fix-endian-arm-floats.patch;patch=1"
+	   file://gconf_version.patch;patch=1"
 
 S = "${WORKDIR}/${PBN}-${PV}"
 
diff --git a/packages/classpath/files/gconf_version.patch b/packages/classpath/files/gconf_version.patch
new file mode 100644
index 0000000000..b1be1209a2
--- /dev/null
+++ b/packages/classpath/files/gconf_version.patch
@@ -0,0 +1,11 @@
+--- classpath-0.93/configure.ac~	2007-03-29 15:52:30.000000000 -0500
++++ classpath-0.93/configure.ac	2007-03-29 15:52:30.000000000 -0500
+@@ -496,7 +496,7 @@
+ 
+   dnl gconf-peer
+   if  test "x${COMPILE_GCONF_PEER}" = xyes; then
+-    PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.11.2)
++    PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.0)
+     AC_SUBST(GCONF_CFLAGS)
+     AC_SUBST(GCONF_LIBS)
+     dnl we also need gdk for locking
-- 
cgit v1.2.3


From 7c62fe0547ac8601b0583747eb6a40ab14e74697 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Wed, 23 May 2007 23:15:47 +0000
Subject: classpath: make disable-automake-checks apply to CVS version of
 classpath-gtk

---
 packages/classpath/classpath-gtk_cvs.bb                   |  3 ++-
 packages/classpath/files/disable-automake-checks-v2.patch | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 packages/classpath/files/disable-automake-checks-v2.patch

(limited to 'packages/classpath')

diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb
index 111f1bf6b8..53f494ab15 100644
--- a/packages/classpath/classpath-gtk_cvs.bb
+++ b/packages/classpath/classpath-gtk_cvs.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
 PRIORITY = "optional"
 SECTION = "libs"
+PR = "r1"
 
 SRCDATE_${PN} ?= "20070501"
 PV = "0.93+cvs${SRCDATE}"
@@ -12,7 +13,7 @@ RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
 SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpath \
-           file://disable-automake-checks.patch;patch=1"
+           file://disable-automake-checks-v2.patch;patch=1"
 
 S = "${WORKDIR}/classpath"
 
diff --git a/packages/classpath/files/disable-automake-checks-v2.patch b/packages/classpath/files/disable-automake-checks-v2.patch
new file mode 100644
index 0000000000..0c1df1acae
--- /dev/null
+++ b/packages/classpath/files/disable-automake-checks-v2.patch
@@ -0,0 +1,11 @@
+--- sablevm-classpath-1.1.7/configure.ac.orig	2004-11-26 00:23:01.000000000 +0100
++++ sablevm-classpath-1.1.7/configure.ac	2004-11-26 00:23:46.000000000 +0100
+@@ -34,7 +34,7 @@
+ AC_SUBST(CLASSPATH_MODULE)
+ 
+ AC_PREREQ(2.59)
+-AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability])
++AM_INIT_AUTOMAKE
+ AC_CONFIG_HEADERS([include/config.h])
+ AC_PREFIX_DEFAULT(/usr/local)
+ 
-- 
cgit v1.2.3


From 49e3d54393d3e30008c9583a8d7fec531f45bcea Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Wed, 23 May 2007 23:36:44 +0000
Subject: classpath: revert seemingly erroneous manipulations of SRC_URI in
 classpath.inc Add gconf_version.patch explicitly to the SRC_URI where
 appropriate

---
 packages/classpath/classpath-gtk_0.93.bb            | 2 ++
 packages/classpath/classpath-minimal-native_0.93.bb | 5 ++++-
 packages/classpath/classpath.inc                    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'packages/classpath')

diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb
index 9577947a0c..137ee8ffb2 100644
--- a/packages/classpath/classpath-gtk_0.93.bb
+++ b/packages/classpath/classpath-gtk_0.93.bb
@@ -4,6 +4,8 @@ DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-
 RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
+SRC_URI += "file://gconf_version.patch;patch=1"
+
 EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi"
 
 PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}"
diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb
index 05fd9b8557..8a08a6c1ce 100644
--- a/packages/classpath/classpath-minimal-native_0.93.bb
+++ b/packages/classpath/classpath-minimal-native_0.93.bb
@@ -1,8 +1,11 @@
-inherit native
 require classpath.inc
 
 DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
 
+SRC_URI += "file://gconf_version.patch;patch=1"
+
+inherit native
+
 EXTRA_OECONF = "--with-jikes --disable-gconf-peer --disable-gtk-peer --disable-plugin --disable-dssi --disable-examples"
 
 do_stage() {
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index 459788c93a..303c286d4e 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -8,7 +8,7 @@ PBN = "classpath"
 
 SRC_URI = "${GNU_MIRROR}/classpath/${PBN}-${PV}.tar.gz \
            file://disable-automake-checks.patch;patch=1 \
-	   file://gconf_version.patch;patch=1"
+           file://fix-endian-arm-floats.patch;patch=1"
 
 S = "${WORKDIR}/${PBN}-${PV}"
 
-- 
cgit v1.2.3


From f8c999dcef86b3deb0be982cbed538010b252204 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Fri, 25 May 2007 11:05:07 +0000
Subject: classpath: update to version 0.1x * unify * fix packaging * rename
 PBN var to PN * cosmetic clean-up

---
 packages/classpath/classpath.inc     | 21 +++++++++++----------
 packages/classpath/classpath_0.14.bb | 26 ++------------------------
 packages/classpath/classpath_0.15.bb | 26 ++------------------------
 packages/classpath/classpath_0.17.bb | 26 ++------------------------
 packages/classpath/classpath_0.18.bb | 25 ++-----------------------
 packages/classpath/classpath_0.19.bb | 25 ++-----------------------
 packages/classpath/classpath_0.20.bb | 25 ++-----------------------
 7 files changed, 23 insertions(+), 151 deletions(-)

(limited to 'packages/classpath')

diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index 303c286d4e..e66f5d7456 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -1,17 +1,15 @@
 DESCRIPTION = "GNU Classpath standard Java libraries"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
 SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Classpath"
+PROVIDES = "classpath"
+RPROVIDES = "classpath"
 
-PBN = "classpath"
-
-SRC_URI = "${GNU_MIRROR}/classpath/${PBN}-${PV}.tar.gz \
+SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \
            file://disable-automake-checks.patch;patch=1 \
            file://fix-endian-arm-floats.patch;patch=1"
 
-S = "${WORKDIR}/${PBN}-${PV}"
-
 inherit autotools
 
 do_stage() {
@@ -21,8 +19,11 @@ do_stage() {
 
 do_install() {
 	autotools_do_install
-	mv ${D}${libdir}/security ${D}${libdir}/${PBN}
+	mv ${D}${libdir}/security ${D}${libdir}/${PN}
 }
 
-PROVIDES = "classpath"
-RPROVIDES = "classpath"
+PACKAGES =+ "classpath-common classpath-examples classpath-tools"
+FILES_classpath-common += "${datadir}/classpath/glibj.zip"
+FILES_classpath-examples += "${datadir}/classpath/examples"
+FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools"
+FILES_classpath-dev += "${libdir}/*.so"
diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb
index 439d973cc8..e4d73bbd3a 100644
--- a/packages/classpath/classpath_0.14.bb
+++ b/packages/classpath/classpath_0.14.bb
@@ -1,32 +1,10 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
-SECTION = "libs"
-PR = "r1"
+require classpath.inc
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
            file://disable-automake-checks.patch;patch=1"
 
-inherit autotools
-
 EXTRA_OECONF = "--with-jikes"
-
-PACKAGES += " ${PN}-common ${PN}-examples"
-
-FILES_${PN} = "${libdir}/${PN}"
-FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
-FILES_${PN}-examples = "${datadir}/${PN}/examples"
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/classpath
-        install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-}
-
-do_install() {
-	autotools_do_install
-	mv ${D}${libdir}/security ${D}${libdir}/${PN}
-}
diff --git a/packages/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb
index 439d973cc8..e4d73bbd3a 100644
--- a/packages/classpath/classpath_0.15.bb
+++ b/packages/classpath/classpath_0.15.bb
@@ -1,32 +1,10 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
-SECTION = "libs"
-PR = "r1"
+require classpath.inc
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
            file://disable-automake-checks.patch;patch=1"
 
-inherit autotools
-
 EXTRA_OECONF = "--with-jikes"
-
-PACKAGES += " ${PN}-common ${PN}-examples"
-
-FILES_${PN} = "${libdir}/${PN}"
-FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
-FILES_${PN}-examples = "${datadir}/${PN}/examples"
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/classpath
-        install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-}
-
-do_install() {
-	autotools_do_install
-	mv ${D}${libdir}/security ${D}${libdir}/${PN}
-}
diff --git a/packages/classpath/classpath_0.17.bb b/packages/classpath/classpath_0.17.bb
index a28591ac0d..e4d73bbd3a 100644
--- a/packages/classpath/classpath_0.17.bb
+++ b/packages/classpath/classpath_0.17.bb
@@ -1,32 +1,10 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
-SECTION = "libs"
-PR = "r1"
+require classpath.inc
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
            file://disable-automake-checks.patch;patch=1"
 
-inherit autotools
-
 EXTRA_OECONF = "--with-jikes"
-
-PACKAGES += " ${PN}-common ${PN}-examples"
-
-FILES_${PN} = "${libdir}/${PN}"
-FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
-FILES_${PN}-examples = "${datadir}/${PN}/examples"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/classpath
-	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-}
-
-do_install() {
-	autotools_do_install
-	mv ${D}${libdir}/security ${D}${libdir}/${PN}
-}
diff --git a/packages/classpath/classpath_0.18.bb b/packages/classpath/classpath_0.18.bb
index a9a2b2cd2d..9b9e8c3451 100644
--- a/packages/classpath/classpath_0.18.bb
+++ b/packages/classpath/classpath_0.18.bb
@@ -1,31 +1,10 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
-SECTION = "libs"
+require classpath.inc
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
            file://disable-automake-checks.patch;patch=1"
 
-inherit autotools
-
 EXTRA_OECONF = "--with-jikes"
-
-PACKAGES += " ${PN}-common ${PN}-examples"
-
-FILES_${PN} = "${libdir}/${PN}"
-FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
-FILES_${PN}-examples = "${datadir}/${PN}/examples"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/classpath
-	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-}
-
-do_install() {
-	autotools_do_install
-	mv ${D}${libdir}/security ${D}${libdir}/${PN}
-}
diff --git a/packages/classpath/classpath_0.19.bb b/packages/classpath/classpath_0.19.bb
index a9a2b2cd2d..9b9e8c3451 100644
--- a/packages/classpath/classpath_0.19.bb
+++ b/packages/classpath/classpath_0.19.bb
@@ -1,31 +1,10 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
-SECTION = "libs"
+require classpath.inc
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
            file://disable-automake-checks.patch;patch=1"
 
-inherit autotools
-
 EXTRA_OECONF = "--with-jikes"
-
-PACKAGES += " ${PN}-common ${PN}-examples"
-
-FILES_${PN} = "${libdir}/${PN}"
-FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
-FILES_${PN}-examples = "${datadir}/${PN}/examples"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/classpath
-	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-}
-
-do_install() {
-	autotools_do_install
-	mv ${D}${libdir}/security ${D}${libdir}/${PN}
-}
diff --git a/packages/classpath/classpath_0.20.bb b/packages/classpath/classpath_0.20.bb
index a9a2b2cd2d..9b9e8c3451 100644
--- a/packages/classpath/classpath_0.20.bb
+++ b/packages/classpath/classpath_0.20.bb
@@ -1,31 +1,10 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
-SECTION = "libs"
+require classpath.inc
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
            file://disable-automake-checks.patch;patch=1"
 
-inherit autotools
-
 EXTRA_OECONF = "--with-jikes"
-
-PACKAGES += " ${PN}-common ${PN}-examples"
-
-FILES_${PN} = "${libdir}/${PN}"
-FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
-FILES_${PN}-examples = "${datadir}/${PN}/examples"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/classpath
-	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-}
-
-do_install() {
-	autotools_do_install
-	mv ${D}${libdir}/security ${D}${libdir}/${PN}
-}
-- 
cgit v1.2.3


From 5a5b87644856b24037b3d3969a3a52758d971e77 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 16 Jun 2007 23:58:49 +0000
Subject: classpath: unb0rk classpath-minimal-native.  Partly fixes 2296.

---
 packages/classpath/classpath-minimal-native_0.93.bb | 3 ++-
 packages/classpath/classpath.inc                    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'packages/classpath')

diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb
index 8a08a6c1ce..f8e88a0217 100644
--- a/packages/classpath/classpath-minimal-native_0.93.bb
+++ b/packages/classpath/classpath-minimal-native_0.93.bb
@@ -1,8 +1,9 @@
 require classpath.inc
 
 DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
+PR = "r1"
 
-SRC_URI += "file://gconf_version.patch;patch=1"
+S = "${WORKDIR}/classpath-${PV}"
 
 inherit native
 
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index e66f5d7456..1d684c0557 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -8,6 +8,7 @@ RPROVIDES = "classpath"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \
            file://disable-automake-checks.patch;patch=1 \
+           file://gconf_version.patch;patch=1 \
            file://fix-endian-arm-floats.patch;patch=1"
 
 inherit autotools
-- 
cgit v1.2.3


From b2d2646a4c47bfd98984f13f42be469bcef92257 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Jun 2007 19:24:14 +0000
Subject: classpath: add virtual/java-native to DEPENDS this package now
 becomes unbuildable until bug 2323 is fixed which also lists a workaround
 Reasoning: the compilation of java requires the java command being available
 java is not among the RequiredSoftware as listed in the wiki There is no
 package providing virtual/java-native yet which is the aim of 2323

---
 packages/classpath/classpath-gtk_cvs.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'packages/classpath')

diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb
index 53f494ab15..dac200249f 100644
--- a/packages/classpath/classpath-gtk_cvs.bb
+++ b/packages/classpath/classpath-gtk_cvs.bb
@@ -8,7 +8,7 @@ PR = "r1"
 SRCDATE_${PN} ?= "20070501"
 PV = "0.93+cvs${SRCDATE}"
 
-DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native"
+DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native virtual/java-native"
 RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
-- 
cgit v1.2.3


From 6a5d18a241746736f548ce5d5e6c315f1f50f53a Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Mon, 18 Jun 2007 19:47:22 +0000
Subject: classpath: unify the gtk_cvs version and leave a note on how to
 compile it.

---
 packages/classpath/classpath-gtk_cvs.bb | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'packages/classpath')

diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb
index dac200249f..690fb761b7 100644
--- a/packages/classpath/classpath-gtk_cvs.bb
+++ b/packages/classpath/classpath-gtk_cvs.bb
@@ -1,13 +1,11 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
-SECTION = "libs"
+require classpath.inc
+
 PR = "r1"
 
 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"
 RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
@@ -17,8 +15,6 @@ SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpa
 
 S = "${WORKDIR}/classpath"
 
-inherit autotools
-
 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}"
@@ -41,6 +37,3 @@ do_install() {
 	autotools_do_install
 	mv ${D}${libdir}/security ${D}${libdir}/${PN}
 }
-
-PROVIDES = "classpath"
-RPROVIDES = "classpath"
-- 
cgit v1.2.3


From f53f96335ecc987fa9b8df806c375d2d2955a968 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 Jun 2007 10:30:29 +0000
Subject: classpath: fix compilation failure of classpath-gtk_cvs.  Closes
 2519. * add libxtst to DEPENDS * fix packaging * move stuff to *.inc (unify)

---
 packages/classpath/classpath-gtk_cvs.bb | 13 ++-----------
 packages/classpath/classpath.inc        | 13 +++++++++++++
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'packages/classpath')

diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb
index 690fb761b7..18d79decae 100644
--- a/packages/classpath/classpath-gtk_cvs.bb
+++ b/packages/classpath/classpath-gtk_cvs.bb
@@ -1,12 +1,12 @@
 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 @@ S = "${WORKDIR}/classpath"
 
 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/
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index 1d684c0557..db75d52a5c 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -28,3 +28,16 @@ FILES_classpath-common += "${datadir}/classpath/glibj.zip"
 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}
+}
-- 
cgit v1.2.3


From 2340b33c5bb2e4206f9c35114a0bcbac711345d7 Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 Jun 2007 13:42:09 +0000
Subject: classpath: some more fixes to packaging, etc and clean-up

---
 packages/classpath/classpath-gtk_0.93.bb            | 11 +----------
 packages/classpath/classpath-minimal-native_0.93.bb |  2 ++
 packages/classpath/classpath-minimal_0.90.bb        | 11 ++---------
 packages/classpath/classpath.inc                    | 13 -------------
 4 files changed, 5 insertions(+), 32 deletions(-)

(limited to 'packages/classpath')

diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb
index 137ee8ffb2..a3b39d92f8 100644
--- a/packages/classpath/classpath-gtk_0.93.bb
+++ b/packages/classpath/classpath-gtk_0.93.bb
@@ -4,15 +4,6 @@ DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-
 RDEPENDS_${PN} = "classpath-common (>= ${PV})"
 RCONFLICTS_${PN} = "classpath-minimal"
 
-SRC_URI += "file://gconf_version.patch;patch=1"
+SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
 
 EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi"
-
-PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}"
-
-FILES_classpath-doc = "${datadir}/info"
-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"
diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb
index f8e88a0217..83cb60142c 100644
--- a/packages/classpath/classpath-minimal-native_0.93.bb
+++ b/packages/classpath/classpath-minimal-native_0.93.bb
@@ -3,6 +3,8 @@ require classpath.inc
 DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native"
 PR = "r1"
 
+SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
+
 S = "${WORKDIR}/classpath-${PV}"
 
 inherit native
diff --git a/packages/classpath/classpath-minimal_0.90.bb b/packages/classpath/classpath-minimal_0.90.bb
index 1339b2dbc8..8d9554c999 100644
--- a/packages/classpath/classpath-minimal_0.90.bb
+++ b/packages/classpath/classpath-minimal_0.90.bb
@@ -4,13 +4,6 @@ DEPENDS = "jikes-native zip-native"
 RDEPENDS_${PBN}-minimal = "${PBN}-common (>= ${PV})"
 RCONFLICTS_${PBN}-minimal = "${PBN}-gtk"
 
-EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa"
-
-PACKAGES = "${PBN}-dev ${PBN}-doc ${PBN}-common ${PBN}-examples ${PBN}-tools ${PN}"
+SRC_URI += "file://disable-automake-checks.patch;patch=1"
 
-FILES_${PBN}-doc = "${datadir}/info"
-FILES_${PBN}-dev = "${includedir}"
-FILES_${PN} = "${libdir}"
-FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip"
-FILES_${PBN}-examples = "${datadir}/${PBN}/examples"
-FILES_${PBN}-tools = "${datadir}/${PBN}/tools"
+EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa"
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index db75d52a5c..d9498c99d5 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -7,7 +7,6 @@ PROVIDES = "classpath"
 RPROVIDES = "classpath"
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \
-           file://disable-automake-checks.patch;patch=1 \
            file://gconf_version.patch;patch=1 \
            file://fix-endian-arm-floats.patch;patch=1"
 
@@ -29,15 +28,3 @@ 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}
-}
-- 
cgit v1.2.3


From 2e88065a351d225db870574fd67a85a1df132751 Mon Sep 17 00:00:00 2001
From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Sat, 28 Jul 2007 16:48:02 +0000
Subject: -introduce new recipes for classpath-minimal -classpath-minimal now
 at 0.95 -seperate install location so no confusion with normal-classpath
 -chosse a sane glibj.zip-location, but we have no java policy yet -provide no
 packages, because it is only for building java virtual machines -second step
 to get MIDP2 support in OE

---
 .../classpath/classpath-minimal-native_0.95.bb     |  8 +++++
 packages/classpath/classpath-minimal.inc           | 39 ++++++++++++++++++++++
 packages/classpath/classpath-minimal_0.95.bb       |  5 +++
 3 files changed, 52 insertions(+)
 create mode 100644 packages/classpath/classpath-minimal-native_0.95.bb
 create mode 100644 packages/classpath/classpath-minimal.inc
 create mode 100644 packages/classpath/classpath-minimal_0.95.bb

(limited to 'packages/classpath')

diff --git a/packages/classpath/classpath-minimal-native_0.95.bb b/packages/classpath/classpath-minimal-native_0.95.bb
new file mode 100644
index 0000000000..c7716ed639
--- /dev/null
+++ b/packages/classpath/classpath-minimal-native_0.95.bb
@@ -0,0 +1,8 @@
+
+# classpath-minimal-native has no packages
+# primary goal is to speed up building of java virtual machines
+
+inherit native
+
+require classpath-minimal.inc
+
diff --git a/packages/classpath/classpath-minimal.inc b/packages/classpath/classpath-minimal.inc
new file mode 100644
index 0000000000..5a2587b56c
--- /dev/null
+++ b/packages/classpath/classpath-minimal.inc
@@ -0,0 +1,39 @@
+DESCRIPTION = "GNU Classpath standard Java libraries"
+HOMEPAGE = "http://www.gnu.org/software/classpath/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Classpath"
+PROVIDES = "classpath"
+RPROVIDES = "classpath"
+
+S = "${WORKDIR}/classpath-${PV}"
+
+SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
+DEPENDS = "ecj-native zip-native"
+
+inherit autotools
+
+
+EXTRA_OECONF = "--with-glibj \
+                --with-ecj=${STAGING_BINDIR_NATIVE}/ecj \
+                --disable-alsa \
+                --disable-gconf-peer \
+                --disable-gtk-peer \
+                --disable-plugin \
+                --disable-dssi \
+                --disable-examples \
+               "
+do_install() {
+        :
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/classpath-minimal/
+        install -m 0644 include/jni.h ${STAGING_INCDIR}/classpath-minimal/
+        install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath-minimal/
+        install -d ${STAGING_LIBDIR}/java/classpath-minimal/
+        install -m 0644 lib/glibj.zip ${STAGING_LIBDIR}/java/classpath-minimal/
+}
+
+PACKAGES = " "
diff --git a/packages/classpath/classpath-minimal_0.95.bb b/packages/classpath/classpath-minimal_0.95.bb
new file mode 100644
index 0000000000..e489a4efc9
--- /dev/null
+++ b/packages/classpath/classpath-minimal_0.95.bb
@@ -0,0 +1,5 @@
+
+# classpath-minimal-native has no packages
+# primary goal is to speed up building of java virtual machines
+
+require classpath-minimal.inc
-- 
cgit v1.2.3