From dcef902e9a2880edd892d8ef226b8c8a27471727 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 Jun 2007 18:28:01 +0000 Subject: minimo: declare missing dependency on zip-native. Looks like there are other dependencies missing since compilation from scratch still fails for me. zip-native is certainly needed, though and thus I commit early and often. --- packages/mozilla/minimo_cvs.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb index 9c29926100..c0e8edc747 100644 --- a/packages/mozilla/minimo_cvs.bb +++ b/packages/mozilla/minimo_cvs.bb @@ -4,7 +4,7 @@ LICENSE = "MPL GPL LGPL" HOMEPAGE = "http://www.mozilla.org/projects/minimo/" PRIORITY = "optional" -DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native" +DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native zip-native" CVSSVR="cvs-mirror.mozilla.org" BRTAG = "MOZILLA_1_8_BRANCH" -- cgit v1.2.3 From 0b5013a28916853b93db43529d96ed68c767c223 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 18 Jun 2007 18:47:19 +0000 Subject: jikes: make jikes-native PROVIDE virtual/javac-native c.f. http://www.openembedded.org/wiki/AdvancedConfiguration --- packages/jikes/jikes-native_1.21.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/jikes/jikes-native_1.21.bb b/packages/jikes/jikes-native_1.21.bb index 7bea3e3cba..2996046639 100644 --- a/packages/jikes/jikes-native_1.21.bb +++ b/packages/jikes/jikes-native_1.21.bb @@ -1,6 +1,7 @@ -SECTION = "devel" inherit native require jikes_${PV}.bb + +PROVIDES = "virtual/javac-native" S = "${WORKDIR}/jikes-${PV}" do_stage() { -- cgit v1.2.3 From b2d2646a4c47bfd98984f13f42be469bcef92257 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie 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') 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 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') 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 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') 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 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') 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