summaryrefslogtreecommitdiffstats
path: root/recipes-extended
diff options
context:
space:
mode:
authorAJ Bagwell <anthony.bagwell@hivehome.com>2021-08-09 14:09:37 +0100
committerRichard Leitner <richard.leitner@skidata.com>2021-08-11 07:19:27 +0200
commitb71a9866abfd5292650ef0afc5ecb9ab5e29b887 (patch)
tree8e7cfd6025f06b4138e2f5fbca61dce7d3a13bac /recipes-extended
parent984f25b6deb5fe4acf82d51c04b2c1392a542723 (diff)
downloadmeta-java-b71a9866abfd5292650ef0afc5ecb9ab5e29b887.tar.gz
all: run convert-overrides (0.9.3) script to convert to new override format
Signed-off-by: AJ Bagwell <anthony.bagwell@hivehome.com> Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-extended')
-rw-r--r--recipes-extended/dbus/dbus-java_2.7.bb14
-rw-r--r--recipes-extended/rxtx/rxtx_2.2.0.bb18
2 files changed, 16 insertions, 16 deletions
diff --git a/recipes-extended/dbus/dbus-java_2.7.bb b/recipes-extended/dbus/dbus-java_2.7.bb
index dfd2ff1..ca7652a 100644
--- a/recipes-extended/dbus/dbus-java_2.7.bb
+++ b/recipes-extended/dbus/dbus-java_2.7.bb
@@ -1,15 +1,15 @@
1SUMMARY = "A pure Java D-Bus Implementation" 1SUMMARY = "A pure Java D-Bus Implementation"
2SUMMARY_${PN}-viewer = "${SUMMARY} (DBusViewer Binary)" 2SUMMARY:${PN}-viewer = "${SUMMARY} (DBusViewer Binary)"
3SUMMARY_${PN}-bin = "${SUMMARY} (Binaries)" 3SUMMARY:${PN}-bin = "${SUMMARY} (Binaries)"
4AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>" 4AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>"
5HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" 5HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
6SECTION = "libs" 6SECTION = "libs"
7LICENSE = "LGPL-2.1 & AFL-2.1" 7LICENSE = "LGPL-2.1 & AFL-2.1"
8 8
9DEPENDS = "libmatthew gettext-native fastjar-native" 9DEPENDS = "libmatthew gettext-native fastjar-native"
10RDEPENDS_${PN}-viewer = "java2-runtime libunixsocket-java ${PN}-bin libmatthew-debug-java ${JPN}" 10RDEPENDS:${PN}-viewer = "java2-runtime libunixsocket-java ${PN}-bin libmatthew-debug-java ${JPN}"
11RDEPENDS_${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" 11RDEPENDS:${PN}-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}"
12RSUGGESTS_${JPN} = "libunixsocket-java" 12RSUGGESTS:${JPN} = "libunixsocket-java"
13 13
14PR = "r1" 14PR = "r1"
15 15
@@ -73,5 +73,5 @@ do_install () {
73# and dbus-bin*.jar 73# and dbus-bin*.jar
74PACKAGES = "${PN}-viewer ${PN}-bin ${JPN}" 74PACKAGES = "${PN}-viewer ${PN}-bin ${JPN}"
75 75
76FILES_${PN}-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" 76FILES:${PN}-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer"
77FILES_${PN}-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" 77FILES:${PN}-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}"
diff --git a/recipes-extended/rxtx/rxtx_2.2.0.bb b/recipes-extended/rxtx/rxtx_2.2.0.bb
index 87d84a8..27935bc 100644
--- a/recipes-extended/rxtx/rxtx_2.2.0.bb
+++ b/recipes-extended/rxtx/rxtx_2.2.0.bb
@@ -27,7 +27,7 @@ SRC_URI[sha256sum] = "3c30373e760f444def3650c76c5a00ae12fb1d860ec008750d084f4880
27 27
28S = "${WORKDIR}/rxtx-2.2pre2" 28S = "${WORKDIR}/rxtx-2.2pre2"
29 29
30INSANE_SKIP_${JPN} += "dev-so" 30INSANE_SKIP:${JPN} += "dev-so"
31 31
32PACKAGE_ARCH = "${TUNE_PKGARCH}" 32PACKAGE_ARCH = "${TUNE_PKGARCH}"
33inherit autotools-brokensep java-library remove-libtool 33inherit autotools-brokensep java-library remove-libtool
@@ -36,7 +36,7 @@ JARFILENAME = "RXTXcomm.jar"
36EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \ 36EXTRA_OEMAKE += "RXTX_PATH=${D}${libdir_jni} \
37 JHOME=${D}${datadir_java}/ext" 37 JHOME=${D}${datadir_java}/ext"
38 38
39do_configure_prepend() { 39do_configure:prepend() {
40 # Ugly but don't complain to me, but upstream ;-) 40 # Ugly but don't complain to me, but upstream ;-)
41 sed -e 's,bin/javah,bin/gjavah,g' \ 41 sed -e 's,bin/javah,bin/gjavah,g' \
42 -e 's,bin/jar,bin/fastjar,g' \ 42 -e 's,bin/jar,bin/fastjar,g' \
@@ -47,16 +47,16 @@ do_configure_prepend() {
47 ${S}/ltmain.sh 47 ${S}/ltmain.sh
48} 48}
49 49
50do_install_prepend() { 50do_install:prepend() {
51 install -d ${D}${libdir_jni} 51 install -d ${D}${libdir_jni}
52 install -d ${D}${datadir_java}/ext 52 install -d ${D}${datadir_java}/ext
53} 53}
54 54
55PACKAGES_remove = "${PN}" 55PACKAGES:remove = "${PN}"
56 56
57FILES_${JPN} += "${libdir_jni}" 57FILES:${JPN} += "${libdir_jni}"
58RPROVIDES_${JPN} = "${PN}" 58RPROVIDES:${JPN} = "${PN}"
59RCONFLICTS_${JPN} = "${PN}" 59RCONFLICTS:${JPN} = "${PN}"
60RREPLACES_${JPN} = "${PN}" 60RREPLACES:${JPN} = "${PN}"
61 61
62FILES_${PN}-dbg += "${libdir_jni}/.debug" 62FILES:${PN}-dbg += "${libdir_jni}/.debug"