diff options
| author | Robert Schuster <robertschuster@fsfe.org> | 2010-08-04 10:52:05 +0200 |
|---|---|---|
| committer | Robert Schuster <robertschuster@fsfe.org> | 2010-08-04 11:23:18 +0200 |
| commit | ab51cc51fcb2b151afd95632bff88b5f4aaa2476 (patch) | |
| tree | dd284d32076934531b7206919ae4937eaaca7945 | |
| parent | ca1608abcfb564678a16156e030ce5d61e652d44 (diff) | |
jsch-native: Deleted.
jzlib-native: Deleted.
jsch: BBCLASSEXTEND="native"-ified.
jzlib: Dito.
| -rw-r--r-- | recipes/jcraft/jsch-native_0.1.40.bb | 8 | ||||
| -rw-r--r-- | recipes/jcraft/jsch_0.1.40.bb | 12 | ||||
| -rw-r--r-- | recipes/jcraft/jzlib-native_1.0.7.bb | 9 | ||||
| -rw-r--r-- | recipes/jcraft/jzlib_1.0.7.bb | 4 |
4 files changed, 14 insertions, 19 deletions
diff --git a/recipes/jcraft/jsch-native_0.1.40.bb b/recipes/jcraft/jsch-native_0.1.40.bb deleted file mode 100644 index 7faf0236cf..0000000000 --- a/recipes/jcraft/jsch-native_0.1.40.bb +++ /dev/null @@ -1,8 +0,0 @@ -require jsch_${PV}.bb - -S = "${WORKDIR}/jsch-${PV}" - -inherit java-native - -DEPENDS = "fastjar-native jzlib-native" -RDEPENDS_${PN} = "" diff --git a/recipes/jcraft/jsch_0.1.40.bb b/recipes/jcraft/jsch_0.1.40.bb index 303195c850..c267bc0205 100644 --- a/recipes/jcraft/jsch_0.1.40.bb +++ b/recipes/jcraft/jsch_0.1.40.bb @@ -8,13 +8,17 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/jsch/jsch-${PV}.zip" inherit java-library DEPENDS = "fastjar-native jzlib" +DEPENDS_virtclass-native = "fastjar-native jzlib-native" + RDEPENDS_${PN} = "libjzlib-java" -PR = "r1" +RDEPENDS_${PN}_virtclass-native = "" + +PR = "r2" do_compile() { mkdir -p build - oe_makeclasspath cp -s jzlib + oe_makeclasspath cp -s jzlib javac -sourcepath src -cp $cp -d build `find src -name "*.java"` @@ -23,3 +27,7 @@ do_compile() { SRC_URI[md5sum] = "b59cec19a487e95aed68378976b4b566" SRC_URI[sha256sum] = "ca9d2ae08fd7a8983fb00d04f0f0c216a985218a5eb364ff9bee73870f28e097" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" + diff --git a/recipes/jcraft/jzlib-native_1.0.7.bb b/recipes/jcraft/jzlib-native_1.0.7.bb deleted file mode 100644 index c750483d10..0000000000 --- a/recipes/jcraft/jzlib-native_1.0.7.bb +++ /dev/null @@ -1,9 +0,0 @@ -require jzlib_${PV}.bb - -S = "${WORKDIR}/jzlib-${PV}" - -inherit java-native - - -SRC_URI[md5sum] = "3c52a0afb970e8a1fb2d34f30d330a83" -SRC_URI[sha256sum] = "20923a3f771a14c58c8cddfff2b589d568aff09f8a931919dc63ddaabb32407a" diff --git a/recipes/jcraft/jzlib_1.0.7.bb b/recipes/jcraft/jzlib_1.0.7.bb index 65ec22b18a..aeae030f8e 100644 --- a/recipes/jcraft/jzlib_1.0.7.bb +++ b/recipes/jcraft/jzlib_1.0.7.bb @@ -19,3 +19,7 @@ do_compile() { SRC_URI[md5sum] = "3c52a0afb970e8a1fb2d34f30d330a83" SRC_URI[sha256sum] = "20923a3f771a14c58c8cddfff2b589d568aff09f8a931919dc63ddaabb32407a" + +NATIVE_INSTALL_WORKS = "1" +BBCLASSEXTEND = "native" + |