From a006daff8334b854e6f44302ead8084e19152416 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 4 Aug 2010 10:00:52 +0200 Subject: avalon-framework-api-native: Remove bsf-native: Dito. log4j1.2-native: Dito. oro-native: Dito. regexp-native: Dito. avalon-framework-api: BBCLASSEXTEND="native"-ified. bsf-native: Dito. log4j1.2-native: Dito. oro-native: Dito. regexp-native: Dito. --- recipes/jakarta-libs/avalon-framework-api-native_4.3.bb | 4 ---- recipes/jakarta-libs/avalon-framework-api_4.3.bb | 5 +++++ recipes/jakarta-libs/bsf-native_2.4.0.bb | 8 -------- recipes/jakarta-libs/bsf_2.4.0.bb | 7 +++++++ recipes/jakarta-libs/log4j1.2-native_1.2.15.bb | 9 --------- recipes/jakarta-libs/log4j1.2_1.2.15.bb | 7 +++++++ recipes/jakarta-libs/logkit-native_1.2.2.bb | 9 --------- recipes/jakarta-libs/logkit_1.2.2.bb | 6 ++++++ recipes/jakarta-libs/oro-native_2.0.8.bb | 4 ---- recipes/jakarta-libs/oro_2.0.8.bb | 5 +++++ recipes/jakarta-libs/regexp-native_1.5.bb | 7 ------- recipes/jakarta-libs/regexp_1.5.bb | 5 +++++ 12 files changed, 35 insertions(+), 41 deletions(-) delete mode 100644 recipes/jakarta-libs/avalon-framework-api-native_4.3.bb delete mode 100644 recipes/jakarta-libs/bsf-native_2.4.0.bb delete mode 100644 recipes/jakarta-libs/log4j1.2-native_1.2.15.bb delete mode 100644 recipes/jakarta-libs/logkit-native_1.2.2.bb delete mode 100644 recipes/jakarta-libs/oro-native_2.0.8.bb delete mode 100644 recipes/jakarta-libs/regexp-native_1.5.bb diff --git a/recipes/jakarta-libs/avalon-framework-api-native_4.3.bb b/recipes/jakarta-libs/avalon-framework-api-native_4.3.bb deleted file mode 100644 index 6733b34ef0..0000000000 --- a/recipes/jakarta-libs/avalon-framework-api-native_4.3.bb +++ /dev/null @@ -1,4 +0,0 @@ -require avalon-framework-api_${PV}.bb - -inherit java-native - diff --git a/recipes/jakarta-libs/avalon-framework-api_4.3.bb b/recipes/jakarta-libs/avalon-framework-api_4.3.bb index 15854f0423..06fde6224c 100644 --- a/recipes/jakarta-libs/avalon-framework-api_4.3.bb +++ b/recipes/jakarta-libs/avalon-framework-api_4.3.bb @@ -11,6 +11,8 @@ inherit java-library DEPENDS = "fastjar-native" +PR = "r1" + do_compile() { mkdir -p build @@ -31,3 +33,6 @@ SRC_URI[archive.md5sum] = "d4cffb4ba1d07bdc517ac6e322636495" SRC_URI[archive.sha256sum] = "a4d56a053609ddfc77f6a42c3f15a11708d5e0eb29ffc60a40b87e4cc7331d47" SRC_URI[logkit.md5sum] = "996ee20d6b5785ab71f4692f64d10f9c" SRC_URI[logkit.sha256sum] = "2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" diff --git a/recipes/jakarta-libs/bsf-native_2.4.0.bb b/recipes/jakarta-libs/bsf-native_2.4.0.bb deleted file mode 100644 index 9b3c1dd11c..0000000000 --- a/recipes/jakarta-libs/bsf-native_2.4.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require bsf_${PV}.bb - -S = "${WORKDIR}/bsf-${PV}" - -inherit java-native - -DEPENDS = "fastjar-native jacl-native commons-logging-native rhino-native xalan-j-native bcel-native" - diff --git a/recipes/jakarta-libs/bsf_2.4.0.bb b/recipes/jakarta-libs/bsf_2.4.0.bb index cbf1346353..ffaa8c6936 100644 --- a/recipes/jakarta-libs/bsf_2.4.0.bb +++ b/recipes/jakarta-libs/bsf_2.4.0.bb @@ -7,6 +7,9 @@ SRC_URI = "http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-${PV}.tar.g inherit java-library DEPENDS = "fastjar-native jacl commons-logging rhino xalan-j bcel" +DEPENDS_virtclass-native = "fastjar-native jacl-native commons-logging-native rhino-native xalan-j-native bcel-native" + +PR = "r1" do_compile() { mkdir -p build @@ -25,3 +28,7 @@ do_compile() { SRC_URI[md5sum] = "7e58b2a009c0f70ab36bbef420b25c07" SRC_URI[sha256sum] = "5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" + diff --git a/recipes/jakarta-libs/log4j1.2-native_1.2.15.bb b/recipes/jakarta-libs/log4j1.2-native_1.2.15.bb deleted file mode 100644 index e21c1568dd..0000000000 --- a/recipes/jakarta-libs/log4j1.2-native_1.2.15.bb +++ /dev/null @@ -1,9 +0,0 @@ -require log4j1.2_${PV}.bb - -inherit java-native - -DEPENDS = "fastjar-native gnumail-native gnujaf-native" - - -SRC_URI[md5sum] = "10f04abe4d68d5a89e8eb167e4e45e1a" -SRC_URI[sha256sum] = "f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31" diff --git a/recipes/jakarta-libs/log4j1.2_1.2.15.bb b/recipes/jakarta-libs/log4j1.2_1.2.15.bb index 08440c7b69..5876a5ff2e 100644 --- a/recipes/jakarta-libs/log4j1.2_1.2.15.bb +++ b/recipes/jakarta-libs/log4j1.2_1.2.15.bb @@ -9,6 +9,9 @@ inherit java-library S = "${WORKDIR}/apache-log4j-${PV}" DEPENDS = "fastjar-native gnumail gnujaf" +DEPENDS_virtclass-native = "fastjar-native gnumail-native gnujaf-native" + +PR = "r1" JARFILENAME = "log4j-${PV}.jar" ALTJARFILENAMES = "log4j-1.2.jar log4j1.2.jar" @@ -28,3 +31,7 @@ do_compile() { SRC_URI[md5sum] = "10f04abe4d68d5a89e8eb167e4e45e1a" SRC_URI[sha256sum] = "f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" + diff --git a/recipes/jakarta-libs/logkit-native_1.2.2.bb b/recipes/jakarta-libs/logkit-native_1.2.2.bb deleted file mode 100644 index 2991d97809..0000000000 --- a/recipes/jakarta-libs/logkit-native_1.2.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require logkit_${PV}.bb - -inherit java-native - -DEPENDS = "fastjar-native oro-native servlet2.3-native gnumail-native gnujaf-native log4j1.2-native avalon-framework-api-native" - - -SRC_URI[md5sum] = "996ee20d6b5785ab71f4692f64d10f9c" -SRC_URI[sha256sum] = "2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8" diff --git a/recipes/jakarta-libs/logkit_1.2.2.bb b/recipes/jakarta-libs/logkit_1.2.2.bb index a6f91db042..c5eceee2b4 100644 --- a/recipes/jakarta-libs/logkit_1.2.2.bb +++ b/recipes/jakarta-libs/logkit_1.2.2.bb @@ -9,6 +9,9 @@ inherit java-library S = "${WORKDIR}/${BP}-dev" DEPENDS = "fastjar-native oro servlet2.3 gnumail gnujaf log4j1.2 avalon-framework-api" +DEPENDS_virtclass-native = "fastjar-native oro-native servlet2.3-native gnumail-native gnujaf-native log4j1.2-native avalon-framework-api-native" + +PR = "r1" do_compile() { mkdir -p build @@ -26,3 +29,6 @@ do_compile() { SRC_URI[md5sum] = "996ee20d6b5785ab71f4692f64d10f9c" SRC_URI[sha256sum] = "2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" diff --git a/recipes/jakarta-libs/oro-native_2.0.8.bb b/recipes/jakarta-libs/oro-native_2.0.8.bb deleted file mode 100644 index 2630ed9b0f..0000000000 --- a/recipes/jakarta-libs/oro-native_2.0.8.bb +++ /dev/null @@ -1,4 +0,0 @@ -require oro_${PV}.bb - -inherit java-native - diff --git a/recipes/jakarta-libs/oro_2.0.8.bb b/recipes/jakarta-libs/oro_2.0.8.bb index 7d98a7f03b..72d73fe3c8 100644 --- a/recipes/jakarta-libs/oro_2.0.8.bb +++ b/recipes/jakarta-libs/oro_2.0.8.bb @@ -10,6 +10,8 @@ S = "${WORKDIR}/jakarta-${BP}" DEPENDS = "fastjar-native" +PR = "r1" + do_compile() { mkdir -p build @@ -20,3 +22,6 @@ do_compile() { SRC_URI[md5sum] = "6f7690c6ba9750e3cbb8ebd10078a79a" SRC_URI[sha256sum] = "4c4f3c7c479994c3ce09f542d4fbdc03eed58a2d7f320d32f2baf238b5b6f566" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" diff --git a/recipes/jakarta-libs/regexp-native_1.5.bb b/recipes/jakarta-libs/regexp-native_1.5.bb deleted file mode 100644 index 74e5a03a15..0000000000 --- a/recipes/jakarta-libs/regexp-native_1.5.bb +++ /dev/null @@ -1,7 +0,0 @@ -require regexp_${PV}.bb - -inherit java-native - - -SRC_URI[md5sum] = "b941b8f4de297827f3211c2cb34af199" -SRC_URI[sha256sum] = "79e80af8cbeb68ddad75a1aa6244d7acd62176bfd69bcdc0640d11177dcde97d" diff --git a/recipes/jakarta-libs/regexp_1.5.bb b/recipes/jakarta-libs/regexp_1.5.bb index 46b4311492..bc82225a85 100644 --- a/recipes/jakarta-libs/regexp_1.5.bb +++ b/recipes/jakarta-libs/regexp_1.5.bb @@ -10,6 +10,8 @@ S = "${WORKDIR}/jakarta-${BP}" DEPENDS = "fastjar-native" +PR = "r1" + do_compile() { mkdir -p build @@ -20,3 +22,6 @@ do_compile() { SRC_URI[md5sum] = "b941b8f4de297827f3211c2cb34af199" SRC_URI[sha256sum] = "79e80af8cbeb68ddad75a1aa6244d7acd62176bfd69bcdc0640d11177dcde97d" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" -- cgit v1.2.3