summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/dbus-java/dbus-java_2.3.bb8
-rw-r--r--packages/dbus-java/dbus-java_2.4.bb8
-rw-r--r--packages/libmatthew/libmatthew.inc71
-rw-r--r--packages/libmatthew/libmatthew_0.5.bb55
-rw-r--r--packages/libmatthew/libmatthew_0.7.1.bb8
-rw-r--r--packages/libmatthew/libmatthew_0.7.bb49
6 files changed, 91 insertions, 108 deletions
diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb
index 71181d961d..756dd9ffe9 100644
--- a/packages/dbus-java/dbus-java_2.3.bb
+++ b/packages/dbus-java/dbus-java_2.3.bb
@@ -7,7 +7,7 @@ SECTION = "libs"
HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>"
-PR = "r3"
+PR = "r4"
inherit java-library
@@ -16,9 +16,9 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz
S = "${WORKDIR}/dbus-java-${PV}"
DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
-RSUGGESTS_libdbus-java = "libmatthew-java dbus"
-RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}"
-RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
do_compile () {
# run target .binclasses first to fix a brokenness in the Makefile
diff --git a/packages/dbus-java/dbus-java_2.4.bb b/packages/dbus-java/dbus-java_2.4.bb
index 461bcb19eb..17b7ccec68 100644
--- a/packages/dbus-java/dbus-java_2.4.bb
+++ b/packages/dbus-java/dbus-java_2.4.bb
@@ -6,10 +6,10 @@ HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
SECTION = "libs"
LICENSE = "GPLv2 AFL"
DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
-RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}"
-RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}"
-RSUGGESTS_libdbus-java = "libmatthew-java dbus"
-PR = "r0"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
+PR = "r1"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
diff --git a/packages/libmatthew/libmatthew.inc b/packages/libmatthew/libmatthew.inc
new file mode 100644
index 0000000000..d7a483e25f
--- /dev/null
+++ b/packages/libmatthew/libmatthew.inc
@@ -0,0 +1,71 @@
+DESCRIPTION = "Unix socket, debug and hexdump libraries"
+AUTHOR = "Matthew Johnson <web@matthew.ath.cx>"
+HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
+SECTION = "libs"
+LICENSE = "LGPL"
+DEPENDS = "classpath-native classpath fastjar-native virtual/javac-native"
+
+S = "${WORKDIR}/libmatthew-java-${PV}"
+
+inherit java-library
+
+# Some internal version numbers which change from time to time.
+# Allowing to override them makes this include file more
+# versatile.
+VER_CGI ?= "0.5"
+VER_DEBUG ?= "1.1"
+VER_HEXDUMP ?= "0.2"
+VER_IO ?= "0.1"
+VER_UNIX ?= "0.5"
+
+do_compile() {
+ oe_runmake \
+ JCFLAGS="-source 1.5" \
+ JAVAC="javac" \
+ JAR="fastjar" \
+ JAVAH="gjavah" \
+ INCLUDES="-I${STAGING_INCDIR}/classpath" \
+ LDFLAGS="-fpic -shared -lc ${LDFLAGS}" \
+ LD="${CC}" \
+ CFLAGS="-fpic -Wall -Os -pedantic -std=c99 -Werror"
+}
+do_install() {
+ oe_jarinstall cgi-${VER_CGI}.jar cgi.jar
+ oe_jarinstall debug-disable-${VER_DEBUG}.jar debug-disable.jar
+ oe_jarinstall debug-enable-${VER_DEBUG}.jar debug-enable.jar
+ oe_jarinstall hexdump-${VER_HEXDUMP}.jar hexdump.jar
+ oe_jarinstall io-${VER_IO}.jar io.jar
+ oe_jarinstall unix-${VER_UNIX}.jar unix.jar
+ oe_libinstall -so libcgi-java ${D}${libdir_jni}
+ oe_libinstall -so libunix-java ${D}${libdir_jni}
+}
+
+do_stage() {
+ oe_jarinstall -s cgi-${VER_CGI}.jar cgi.jar
+ oe_jarinstall -s debug-disable-${VER_DEBUG}.jar debug-disable.jar
+ oe_jarinstall -s debug-enable-${VER_DEBUG}.jar debug-enable.jar
+ oe_jarinstall -s hexdump-${VER_HEXDUMP}.jar hexdump.jar
+ oe_jarinstall -s io-${VER_IO}.jar io.jar
+ oe_jarinstall -s unix-${VER_UNIX}.jar unix.jar
+}
+
+PACKAGES = "\
+ libcgi-java libcgi-jni libcgi-jni-dbg \
+ libunixsocket-java libunixsocket-jni libunixsocket-jni-dbg \
+ ${PN}-io-java ${PN}-debug-java \
+"
+
+FILES_libcgi-java = "${datadir_java}/cgi*.jar"
+FILES_libcgi-jni = "${libdir_jni}/libcgi-java.so"
+FILES_libcgi-jni-dbg = "${libdir_jni}/.debug/libcgi-java.so"
+RDEPENDS_libcgi-java = "libcgi-jni"
+
+FILES_libunixsocket-java = "${datadir_java}/unix*.jar"
+FILES_libunixsocket-jni = "${libdir_jni}/libunix-java.so"
+FILES_libunixsocket-jni-dbg = "${libdir_jni}/.debug/libunix-java.so"
+RDEPENDS_libunixsocket-java = "libunixsocket-jni"
+
+FILES_${PN}-io-java = "${datadir_java}/io*.jar"
+
+FILES_${PN}-debug-java = "${datadir_java}/debug-*.jar ${datadir_java}/hexdump*.jar"
+
diff --git a/packages/libmatthew/libmatthew_0.5.bb b/packages/libmatthew/libmatthew_0.5.bb
deleted file mode 100644
index fb7ea3cce8..0000000000
--- a/packages/libmatthew/libmatthew_0.5.bb
+++ /dev/null
@@ -1,55 +0,0 @@
-DESCRIPTION = "Unix socket, debug and hexdump libraries"
-LICENSE = "LGPL"
-SECTION = "libs"
-HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
-AUTHOR = "Matthew Johnson <web@matthew.ath.cx>"
-
-PR = "r1"
-
-inherit java-library
-
-DEPENDS = "classpath-native classpath fastjar-native"
-
-SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz"
-
-S = "${WORKDIR}/libmatthew-java-${PV}"
-
-do_compile() {
- oe_runmake \
- JCFLAGS="-source 1.5" \
- JAVAC="javac" \
- JAR="fastjar" \
- JAVAH="gjavah" \
- INCLUDES="-I${STAGING_INCDIR}/classpath" \
- LDFLAGS="-fpic -shared -lc ${LDFLAGS}" \
- LD="${CC}"
-}
-
-do_stage() {
- oe_jarinstall -s cgi-0.5.jar cgi.jar
- oe_jarinstall -s debug-disable-1.1.jar debug-disable.jar
- oe_jarinstall -s debug-enable-1.1.jar debug-enable.jar
- oe_jarinstall -s hexdump-0.1.jar hexdump.jar
- oe_jarinstall -s io-0.1.jar io.jar
- oe_jarinstall -s unix-0.2.jar unix.jar
-}
-
-do_install() {
- oe_jarinstall cgi-0.5.jar cgi.jar
- oe_jarinstall debug-disable-1.1.jar debug-disable.jar
- oe_jarinstall debug-enable-1.1.jar debug-enable.jar
- oe_jarinstall hexdump-0.1.jar hexdump.jar
- oe_jarinstall io-0.1.jar io.jar
- oe_jarinstall unix-0.2.jar unix.jar
-
- oe_libinstall -so libcgi-java ${D}${libdir_jni}
- oe_libinstall -so libunix-java ${D}${libdir_jni}
-}
-
-PACKAGES += "${PN}-jni ${PN}-jni-dbg"
-
-RDEPENDS_${JPN} = "${PN}-jni"
-
-FILES_${PN}-jni = "${libdir_jni}/lib*.so"
-FILES_${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so"
-
diff --git a/packages/libmatthew/libmatthew_0.7.1.bb b/packages/libmatthew/libmatthew_0.7.1.bb
new file mode 100644
index 0000000000..2a3092cda5
--- /dev/null
+++ b/packages/libmatthew/libmatthew_0.7.1.bb
@@ -0,0 +1,8 @@
+require libmatthew.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
+ file://Makefile-0.7.patch;patch=1"
+
+
diff --git a/packages/libmatthew/libmatthew_0.7.bb b/packages/libmatthew/libmatthew_0.7.bb
index 68be750f8e..054881cf9b 100644
--- a/packages/libmatthew/libmatthew_0.7.bb
+++ b/packages/libmatthew/libmatthew_0.7.bb
@@ -1,50 +1,9 @@
-DESCRIPTION = "Unix socket, debug and hexdump libraries"
-AUTHOR = "Matthew Johnson <web@matthew.ath.cx>"
-HOMEPAGE = "http://www.matthew.ath.cx/projects/java"
-SECTION = "libs"
-LICENSE = "LGPL"
-DEPENDS = "classpath-native classpath fastjar-native virtual/javac-native"
-RDEPENDS_${JPN} = "${PN}-jni"
-PR = "r0"
+require libmatthew.inc
+
+PR = "r1"
SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz \
file://Makefile-0.7.patch;patch=1"
-S = "${WORKDIR}/libmatthew-java-${PV}"
-
-inherit java-library
-
-do_compile() {
- oe_runmake \
- JCFLAGS="-source 1.5" \
- JAVAC="javac" \
- JAR="fastjar" \
- JAVAH="gjavah" \
- INCLUDES="-I${STAGING_INCDIR}/classpath" \
- LDFLAGS="-fpic -shared -lc ${LDFLAGS}" \
- LD="${CC}" \
- CFLAGS="-fpic -Wall -Os -pedantic -std=c99 -Werror"
-}
-do_install() {
- oe_jarinstall cgi-0.5.jar cgi.jar
- oe_jarinstall debug-disable-1.1.jar debug-disable.jar
- oe_jarinstall debug-enable-1.1.jar debug-enable.jar
- oe_jarinstall hexdump-0.2.jar hexdump.jar
- oe_jarinstall io-0.1.jar io.jar
- oe_jarinstall unix-0.4.jar unix.jar
- oe_libinstall -so libcgi-java ${D}${libdir_jni}
- oe_libinstall -so libunix-java ${D}${libdir_jni}
-}
-do_stage() {
- oe_jarinstall -s cgi-0.5.jar cgi.jar
- oe_jarinstall -s debug-disable-1.1.jar debug-disable.jar
- oe_jarinstall -s debug-enable-1.1.jar debug-enable.jar
- oe_jarinstall -s hexdump-0.2.jar hexdump.jar
- oe_jarinstall -s io-0.1.jar io.jar
- oe_jarinstall -s unix-0.4.jar unix.jar
-}
-
-PACKAGES += "${PN}-jni ${PN}-jni-dbg"
+VER_UNIX ?= "0.4"
-FILES_${PN}-jni = "${libdir_jni}/lib*.so"
-FILES_${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 07:23:29 +0000