From cfda09395f2c5c5e21f222798e7a07e26e99367e Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Thu, 4 Jan 2018 14:19:04 +0100 Subject: meta: drop redundant DEPENDS_virtcalss-native definitions The DEPENDS would be handled in native.bbclass, it's not necessary to set them explicitly in recipes. Signed-off-by: Ming Liu Signed-off-by: Otavio Salvador --- recipes-core/bcel/bcel_5.2.bb | 2 -- recipes-core/jakarta-commons/commons-logging_1.1.1.bb | 1 - recipes-core/jakarta-commons/commons-net_1.4.1.bb | 1 - recipes-core/jakarta-libs/bsf_2.4.0.bb | 1 - recipes-core/jakarta-libs/log4j1.2_1.2.17.bb | 1 - recipes-core/jakarta-libs/logkit_1.2.2.bb | 1 - recipes-core/jcraft/jsch_0.1.40.bb | 1 - recipes-core/xalan-j/xalan-j_2.7.1.bb | 3 --- recipes-core/xerces-j/xerces-j_2.11.0.bb | 1 - recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb | 1 - 10 files changed, 13 deletions(-) diff --git a/recipes-core/bcel/bcel_5.2.bb b/recipes-core/bcel/bcel_5.2.bb index 6ff345d..89a9a61 100644 --- a/recipes-core/bcel/bcel_5.2.bb +++ b/recipes-core/bcel/bcel_5.2.bb @@ -8,8 +8,6 @@ SRC_URI = "http://archive.apache.org/dist/jakarta/bcel/source/${BP}-src.tar.gz" inherit java-library DEPENDS = "xerces-j regexp" -DEPENDS_virtclass-native = "xerces-j-native regexp-native" - do_compile() { mkdir -p build diff --git a/recipes-core/jakarta-commons/commons-logging_1.1.1.bb b/recipes-core/jakarta-commons/commons-logging_1.1.1.bb index b3b508a..79f041e 100644 --- a/recipes-core/jakarta-commons/commons-logging_1.1.1.bb +++ b/recipes-core/jakarta-commons/commons-logging_1.1.1.bb @@ -7,7 +7,6 @@ DESCRIPTION = "Java Internet protocol suite library" SRC_URI = "http://archive.apache.org/dist/commons/logging/source/${BP}-src.tar.gz" DEPENDS += "log4j1.2 servlet2.3 logkit" -DEPENDS_virtclass-native += "log4j1.2-native servlet2.3-native logkit-native" CP = "log4j-1.2 servlet-2.3 logkit" diff --git a/recipes-core/jakarta-commons/commons-net_1.4.1.bb b/recipes-core/jakarta-commons/commons-net_1.4.1.bb index 275ebb9..239907e 100644 --- a/recipes-core/jakarta-commons/commons-net_1.4.1.bb +++ b/recipes-core/jakarta-commons/commons-net_1.4.1.bb @@ -10,7 +10,6 @@ SRC_URI = "http://archive.apache.org/dist/commons/net/source/${BP}-src.tar.gz" S = "${WORKDIR}/${BP}" DEPENDS += "oro" -DEPENDS_virtclass-native += "oro-native" RDEPENDS_${PN} = "liboro-java" RDEPENDS_${PN}_virtclass-native = "" diff --git a/recipes-core/jakarta-libs/bsf_2.4.0.bb b/recipes-core/jakarta-libs/bsf_2.4.0.bb index 0213004..b312c42 100644 --- a/recipes-core/jakarta-libs/bsf_2.4.0.bb +++ b/recipes-core/jakarta-libs/bsf_2.4.0.bb @@ -9,7 +9,6 @@ SRC_URI = "http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-${PV}.tar.g inherit java-library DEPENDS = "jacl commons-logging rhino xalan-j bcel" -DEPENDS_virtclass-native = "jacl-native commons-logging-native rhino-native xalan-j-native bcel-native" do_compile() { mkdir -p build diff --git a/recipes-core/jakarta-libs/log4j1.2_1.2.17.bb b/recipes-core/jakarta-libs/log4j1.2_1.2.17.bb index b4ccd2c..2f04e96 100644 --- a/recipes-core/jakarta-libs/log4j1.2_1.2.17.bb +++ b/recipes-core/jakarta-libs/log4j1.2_1.2.17.bb @@ -10,7 +10,6 @@ SRC_URI = "http://archive.apache.org/dist/logging/log4j/${PV}/log4j-${PV}.tar.gz inherit java-library DEPENDS = "gnumail gnujaf" -DEPENDS_virtclass-native = "gnumail-native gnujaf-native" S = "${WORKDIR}/apache-log4j-${PV}" diff --git a/recipes-core/jakarta-libs/logkit_1.2.2.bb b/recipes-core/jakarta-libs/logkit_1.2.2.bb index c3b612b..8b4de11 100644 --- a/recipes-core/jakarta-libs/logkit_1.2.2.bb +++ b/recipes-core/jakarta-libs/logkit_1.2.2.bb @@ -11,7 +11,6 @@ inherit java-library S = "${WORKDIR}/${BP}-dev" DEPENDS = "oro servlet2.3 gnumail gnujaf log4j1.2 avalon-framework-api" -DEPENDS_virtclass-native = "oro-native servlet2.3-native gnumail-native gnujaf-native log4j1.2-native avalon-framework-api-native" do_compile() { mkdir -p build diff --git a/recipes-core/jcraft/jsch_0.1.40.bb b/recipes-core/jcraft/jsch_0.1.40.bb index 337a8eb..0be0883 100644 --- a/recipes-core/jcraft/jsch_0.1.40.bb +++ b/recipes-core/jcraft/jsch_0.1.40.bb @@ -8,7 +8,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/jsch/jsch-${PV}.zip" inherit java-library DEPENDS = "jzlib" -DEPENDS_virtclass-native = "jzlib-native" RDEPENDS_${PN} = "libjzlib-java" RDEPENDS_${PN}_virtclass-native = "" diff --git a/recipes-core/xalan-j/xalan-j_2.7.1.bb b/recipes-core/xalan-j/xalan-j_2.7.1.bb index 317b3c9..f7ee260 100644 --- a/recipes-core/xalan-j/xalan-j_2.7.1.bb +++ b/recipes-core/xalan-j/xalan-j_2.7.1.bb @@ -10,9 +10,6 @@ HOMEPAGE = "http://xml.apache.org/xalan-j" PR = "r1" DEPENDS = "xerces-j regexp jlex cup jaxp1.3 bcel" -DEPENDS_virtclass-native = " \ - xerces-j-native regexp-native jlex-native cup-native jaxp1.3-native bcel-native \ - " SRC_URI = "\ http://archive.apache.org/dist/xml/${BPN}/${BPN}_2_7_1-src.tar.gz;name=archive \ diff --git a/recipes-core/xerces-j/xerces-j_2.11.0.bb b/recipes-core/xerces-j/xerces-j_2.11.0.bb index 4a0cc91..1b96f00 100644 --- a/recipes-core/xerces-j/xerces-j_2.11.0.bb +++ b/recipes-core/xerces-j/xerces-j_2.11.0.bb @@ -21,7 +21,6 @@ inherit java-library JPN = "libxerces2-java" DEPENDS = "fastjar-native jaxp1.3 xml-commons-resolver1.1" -DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native xml-commons-resolver1.1-native" RDEPENDS_${PN} = "libjaxp1.3-java libxml-commons-resolver1.1-java" RDEPENDS_${PN}_virtclass-native = "" diff --git a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb index 77556fc..42ce703 100644 --- a/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb +++ b/recipes-core/xml-commons/xml-commons-resolver1.1_1.2.bb @@ -11,7 +11,6 @@ inherit java-library S = "${WORKDIR}/xml-commons-resolver-${PV}" DEPENDS = "fastjar-native jaxp1.3" -DEPENDS_virtclass-native = "fastjar-native jaxp1.3-native" do_unpackpost[dirs] = "${B}" do_unpackpost() { -- cgit v1.2.3-54-g00ecf