From 6503766d83584f9a067d1dd6c85f4d4f8adf651b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 26 Oct 2012 00:24:30 -0700 Subject: openjdk-7: Fix build for ppc e500/e5500 Signed-off-by: Khem Raj --- .../icedtea-jdk-powerpc-atomic64.patch | 65 ++++++++++++++++++++++ recipes-core/openjdk/openjdk-7-release-03b21.inc | 2 + 2 files changed, 67 insertions(+) create mode 100644 recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-powerpc-atomic64.patch diff --git a/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-powerpc-atomic64.patch b/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-powerpc-atomic64.patch new file mode 100644 index 0000000..cc5e4e8 --- /dev/null +++ b/recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-powerpc-atomic64.patch @@ -0,0 +1,65 @@ +http://mail.openjdk.java.net/pipermail/zero-dev/2010-June/000346.html + +this cute C code does the same thing on powerpc as the assembly code that +was here before. If the compiler was built with the SPE extensions instead +of traditional FPU and double operations are performed in HW then we are +one step further: The compiler turns this into evldd & evstdd. Voila :) + +This C code could also be activated on s390. The compiler turns this into +a single mvc instruction which does the copy operation. I don't know if +mvc's copy ability is atomic _or_ not and therefore I leave it as it. + +Signed-off-by: Sebastian Andrzej Siewior + +./openjdk-src-dir/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp +Index: openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp +=================================================================== +--- openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp.org 2011-11-14 14:07:32.000000000 -0800 ++++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp 2012-07-19 07:28:26.208405923 -0700 +@@ -25,6 +25,16 @@ + + #ifndef OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP + #define OS_CPU_LINUX_ZERO_VM_OS_LINUX_ZERO_HPP ++#if defined(PPC) && !defined(_LP64) ++ ++#ifndef __NO_FPRS__ ++#define ATOMIC64_COPY_THROUGH_DOUBLE 1 ++ ++#elif defined(__SPE__) && !defined(_SOFT_DOUBLE) ++#define ATOMIC64_COPY_THROUGH_DOUBLE 1 ++ ++#endif ++#endif + + static void setup_fpu() {} + +@@ -36,12 +46,23 @@ + + // Atomically copy 64 bits of data + static void atomic_copy64(volatile void *src, volatile void *dst) { +-#if defined(PPC) && !defined(_LP64) +- double tmp; +- asm volatile ("lfd %0, 0(%1)\n" +- "stfd %0, 0(%2)\n" +- : "=f"(tmp) +- : "b"(src), "b"(dst)); ++#if ATOMIC64_COPY_THROUGH_DOUBLE ++ /* ++ * In order to copy 8 bytes atomicly we rely on the trick that some ++ * architectures can load and store a double as a single operation. ++ * gcc picks the correct opcode here and with optimization turned on ++ * all temporary assignments are gone. - bigeasy ++ */ ++ union { ++ double *d; ++ volatile void *v; ++ } s, d; ++ ++ s.v = src; ++ d.v = dst; ++ ++ *d.d = *s.d; ++ + #elif defined(S390) && !defined(_LP64) + double tmp; + asm volatile ("ld %0, 0(%1)\n" diff --git a/recipes-core/openjdk/openjdk-7-release-03b21.inc b/recipes-core/openjdk/openjdk-7-release-03b21.inc index 40c1cf6..2038e07 100644 --- a/recipes-core/openjdk/openjdk-7-release-03b21.inc +++ b/recipes-core/openjdk/openjdk-7-release-03b21.inc @@ -96,6 +96,7 @@ ICEDTEAPATCHES = "\ ICEDTEAPATCHES_append_powerpc = " \ file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ + file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ " ICEDTEAPATCHES_append_powerpc64 = " \ file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ @@ -139,6 +140,7 @@ DISTRIBUTION_PATCHES_append_libc-uclibc = "\ DISTRIBUTION_PATCHES_append_powerpc = " \ patches/icedtea-jdk-nio-use-host-cc.patch \ patches/icedtea-jdk-ppc64-jvm-cfg.patch \ + patches/icedtea-jdk-powerpc-atomic64.patch \ " DISTRIBUTION_PATCHES_append_powerpc64 = " \ patches/icedtea-jdk-nio-use-host-cc.patch \ -- cgit v1.2.3-54-g00ecf From a56246f3f69d60541b276ca91e15c3bc24bb79e2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 26 Oct 2012 00:25:01 -0700 Subject: libecj-bootstrap,junit: Tweak to fix rebuild issues When rebuilding in already built tree we have these issues where a file is already deleted first time but rm fails on reexecution. This patch adds checks for such cases so that rebuilds are guarnteed Signed-off-by: Khem Raj --- recipes-core/ecj/libecj-bootstrap.inc | 9 +++++---- recipes-core/junit/junit_3.8.2.bb | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc index 4f85ba9..9e1cc1d 100644 --- a/recipes-core/ecj/libecj-bootstrap.inc +++ b/recipes-core/ecj/libecj-bootstrap.inc @@ -25,17 +25,18 @@ do_unpackpost() { fi # Remove crap. - rm about.html build.xml + rm -f about.html build.xml rm -rf META-INF # Move source into separate subdir. - mv org source/ - + if [ -d org ]; then + mv org source/ + fi # Remove stuff unneeded for the bootstrap compiler. rm -rf source/org/eclipse/jdt/internal/compiler/apt rm -rf source/org/eclipse/jdt/internal/compiler/tool rm -rf source/org/eclipse/jdt/internal/antadapter - rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java + rm -f source/org/eclipse/jdt/core/JDTCompilerAdapter.java # Make a copy of the remaining source to get the embedded # resources. diff --git a/recipes-core/junit/junit_3.8.2.bb b/recipes-core/junit/junit_3.8.2.bb index 9d56618..ded03f2 100644 --- a/recipes-core/junit/junit_3.8.2.bb +++ b/recipes-core/junit/junit_3.8.2.bb @@ -14,8 +14,9 @@ do_unpackpost() { mkdir -p src # Prevent deletion by do_removebinaries. - mv src.jar src.zip - + if [ -e src.jar ]; then + mv src.jar src.zip + fi unzip src.zip -d src } -- cgit v1.2.3-54-g00ecf From e03f96388104079c39667e865bdc337d23b8358b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 29 Oct 2012 17:30:38 -0700 Subject: icedtea7-native: Add missing dependency on missing unzip-native Signed-off-by: Khem Raj --- recipes-core/icedtea/icedtea7-native.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index e209a68..b9e2056 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools" HOMEPAGE = "http://icedtea.classpath.org" LICENSE = "GPL-2.0-with-classpath-exception" -INC_PR = "r0" +INC_PR = "r1" DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ rhino-native ant-native \ @@ -9,6 +9,7 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ giflib-native jpeg-native libpng-native \ glib-2.0-native freetype-native zlib-native \ fontconfig-native zip-native alsa-lib-native \ + unzip-native \ " inherit native java autotools -- cgit v1.2.3-54-g00ecf From 07c21b51c9588287bdd0243799479009633106e8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 25 Nov 2012 13:18:51 -0800 Subject: dbus-java,libmatthew: Add recipes for dbus-java 2.7 and libmatthew 0.8 Signed-off-by: Khem Raj --- recipes-core/dbus/dbus-java_2.7.bb | 92 ++++++++++++++++++++++++ recipes-core/libmatthew/files/Makefile-0.7.patch | 15 ++++ recipes-core/libmatthew/libmatthew.inc | 68 ++++++++++++++++++ recipes-core/libmatthew/libmatthew_0.8.bb | 12 ++++ 4 files changed, 187 insertions(+) create mode 100644 recipes-core/dbus/dbus-java_2.7.bb create mode 100644 recipes-core/libmatthew/files/Makefile-0.7.patch create mode 100644 recipes-core/libmatthew/libmatthew.inc create mode 100644 recipes-core/libmatthew/libmatthew_0.8.bb diff --git a/recipes-core/dbus/dbus-java_2.7.bb b/recipes-core/dbus/dbus-java_2.7.bb new file mode 100644 index 0000000..2fae051 --- /dev/null +++ b/recipes-core/dbus/dbus-java_2.7.bb @@ -0,0 +1,92 @@ +DESCRIPTION = "A pure Java D-Bus Implementation" +DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)" +DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)" +AUTHOR = "Matthew Johnson " +HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" +SECTION = "libs" +LICENSE = "LGPL-2.1 & AFL-2.1" + +DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" +RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java dbus-java-bin libmatthew-debug-java ${JPN}" +RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" +RSUGGESTS_libdbus-java = "libunixsocket-java" + +PR = "r0" +LIC_FILES_CHKSUM = "file://COPYING;md5=72cc739fb93ae32741edbae802490e92" +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz" + +SRC_URI[md5sum] = "8b8470db5cd657591bac245e3b6e18e4" +SRC_URI[sha256sum] = "be404ea36284d938646192d0ee42e146853064217d4e3aaf89b56bd351ebca33" + +S = "${WORKDIR}/dbus-java-${PV}" + +inherit java-library + +# jamvm-native unfortunately contains non-generificed java/lang/reflect classes +# which are accessed in this package. Work around this by setting the bootclasspath +# explicitly. +JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" + +do_compile () { + oe_runmake \ + JCFLAGS="-source 1.5 ${JCFLAGS}" \ + JAVAC="javac" \ + JARPREFIX="${STAGING_DATADIR_JAVA}" \ + JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ + JAVAUNIXLIBDIR="${STAGING_DIR_TARGET}${libdir_jni}" \ + CLASSPATH="${S}/classes" \ + JAR="fastjar" \ + bin + + # Generated shell scripts will have staging paths inside them. + rm bin/* + + # Generate them again with target paths. + oe_runmake \ + JAVAC="oefatal \"No Java compilation expected here.\"" \ + JAR="oefatal \"No jar invocation expected here.\"" \ + JARPREFIX=${datadir_java} \ + JAVAUNIXJARDIR=${datadir_java} \ + JAVAUNIXLIBDIR=${libdir_jni} \ + bin + + # Generate man pages. + oe_runmake \ + JAVAC="oefatal \"No Java compilation expected here.\"" \ + JAR="oefatal \"No jar invocation expected here.\"" \ + JARPREFIX=${datadir_java} \ + JAVAUNIXJARDIR=${datadir_java} \ + JAVAUNIXLIBDIR=${libdir_jni} \ + man +} + +JARFILENAME = "${JPN}-${PV}.jar" + +do_install () { + oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar dbus.jar + oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar dbus-viewer.jar + oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar dbus-bin.jar + + install -d ${D}${bindir} + install bin/DBusViewer ${D}${bindir} + install bin/DBusCall ${D}${bindir} + install bin/CreateInterface ${D}${bindir} + install bin/ListDBus ${D}${bindir} + install bin/DBusDaemon ${D}${bindir} + + oe_runmake \ + JAVAC="oefatal \"No Java compilation expected here.\"" \ + JAR="oefatal \"No jar invocation expected here.\"" \ + MANPREFIX=${D}${mandir} \ + DOCPREFIX=${D}${docdir}/${JPN} \ + install-man +} + +# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar +# and dbus-bin*.jar +PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}" + +FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" +FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*" +FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" +FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}" diff --git a/recipes-core/libmatthew/files/Makefile-0.7.patch b/recipes-core/libmatthew/files/Makefile-0.7.patch new file mode 100644 index 0000000..4a91cd5 --- /dev/null +++ b/recipes-core/libmatthew/files/Makefile-0.7.patch @@ -0,0 +1,15 @@ +Index: libmatthew-java-0.7/Makefile +=================================================================== +--- libmatthew-java-0.7.orig/Makefile 2008-05-27 13:17:47.000000000 +0800 ++++ libmatthew-java-0.7/Makefile 2008-05-27 13:18:04.000000000 +0800 +@@ -8,8 +8,8 @@ + PPFLAGS+=-C -P + CFLAGS+=-fpic -Wall -Os -pedantic -std=c99 -Werror + GCJFLAGS+=-fjni +-JCFLAGS+=-source 5.0 +-INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux ++#JCFLAGS+=-source 5.0 ++#INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux + JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/ + + LDVER?=$(shell ld -v | cut -d' ' -f1) diff --git a/recipes-core/libmatthew/libmatthew.inc b/recipes-core/libmatthew/libmatthew.inc new file mode 100644 index 0000000..d0ea00a --- /dev/null +++ b/recipes-core/libmatthew/libmatthew.inc @@ -0,0 +1,68 @@ +DESCRIPTION = "Unix socket, debug and hexdump JAVA libraries" +AUTHOR = "Matthew Johnson " +HOMEPAGE = "http://www.matthew.ath.cx/projects/java" +SECTION = "libs" +LICENSE = "MIT" +DEPENDS = "virtual/java-native classpath-native classpath" + +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.6" +VER_DEBUG ?= "1.1" +VER_HEXDUMP ?= "0.2" +VER_IO ?= "0.1" +VER_UNIX ?= "0.5" + +do_compile() { + oe_runmake \ + 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" +} + +# we do not have jar name corresponding to JPN +# which will be installed via JARFILENAME see java-library.bbclass +# create a dummy for install to succeed + +JARFILENAME = "unix-${VER_UNIX}.jar" + +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} +} + +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/recipes-core/libmatthew/libmatthew_0.8.bb b/recipes-core/libmatthew/libmatthew_0.8.bb new file mode 100644 index 0000000..c4ace08 --- /dev/null +++ b/recipes-core/libmatthew/libmatthew_0.8.bb @@ -0,0 +1,12 @@ +require libmatthew.inc + +PR = "r0" + +LIC_FILES_CHKSUM = "file://COPYING;md5=48a42f2f9747f02bf40a0bce2655b509" + +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-${PV}.tar.gz \ + " +# file://Makefile-0.7.patch" +SRC_URI[md5sum] = "8455b8751083ce25c99c2840609271f5" +SRC_URI[sha256sum] = "05d1d3d9b5e33bd3642102aae10bba904e296c5c01a10854200ad4df349c8dfa" + -- cgit v1.2.3-54-g00ecf From 3506a66b1be8b4dab1072a2c55b2fe4260aefd83 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 25 Nov 2012 13:19:41 -0800 Subject: fastjar-native: install symlink for jar native recipe also need to install jar symlink since dbus-java needs it Signed-off-by: Khem Raj --- recipes-core/fastjar/fastjar.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes-core/fastjar/fastjar.inc b/recipes-core/fastjar/fastjar.inc index efbc226..eb3d354 100644 --- a/recipes-core/fastjar/fastjar.inc +++ b/recipes-core/fastjar/fastjar.inc @@ -19,4 +19,9 @@ ALTERNATIVE_NAME = "jar" ALTERNATIVE_LINK = "${bindir}/jar" ALTERNATIVE_PATH = "${bindir}/fastjar" +# update-aternatives does not work for native class +do_install_append_class-native () { + ln -s fastjar ${D}${bindir}/jar +} + BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf From bcd5a1f3e83f9fffacdd72bc54424d5b7d62bf56 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 25 Nov 2012 13:18:18 -0800 Subject: classpath: Fix build for 64bit target using lib64 for base_libdir Signed-off-by: Khem Raj --- .../classpath/classpath-0.99/use_libdir.patch | 19 +++++++++++++++++++ recipes-core/classpath/classpath.inc | 2 +- recipes-core/classpath/classpath_0.99.bb | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 recipes-core/classpath/classpath-0.99/use_libdir.patch diff --git a/recipes-core/classpath/classpath-0.99/use_libdir.patch b/recipes-core/classpath/classpath-0.99/use_libdir.patch new file mode 100644 index 0000000..3b4df90 --- /dev/null +++ b/recipes-core/classpath/classpath-0.99/use_libdir.patch @@ -0,0 +1,19 @@ +on some arches we use lib64 for libdir so hardcoding to lib +is not gonna work always + +Signed-off-by: Khem Raj + +Index: classpath-0.99/resource/Makefile.am +=================================================================== +--- classpath-0.99.orig/resource/Makefile.am 2006-01-12 12:15:43.000000000 -0800 ++++ classpath-0.99/resource/Makefile.am 2012-11-21 14:28:02.433005139 -0800 +@@ -1,7 +1,7 @@ + ## used by automake to generate Makefile.in + + logging_DATA = java/util/logging/logging.properties +-loggingdir = $(prefix)/lib ++loggingdir = $(libdir) + + security_DATA = java/security/classpath.security +-securitydir = $(prefix)/lib/security ++securitydir = $(libdir)/security diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc index 1a8093e..214c9cd 100644 --- a/recipes-core/classpath/classpath.inc +++ b/recipes-core/classpath/classpath.inc @@ -21,7 +21,7 @@ RPROVIDES_${PN} = "${PBN}" RPROVIDES_${PN}-common = "${PBN}-common" RPROVIDES_${PN}-gtk = "${PBN}-awt" -PR = "r1" +PR = "r2" SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb index ee38992..7839519 100644 --- a/recipes-core/classpath/classpath_0.99.bb +++ b/recipes-core/classpath/classpath_0.99.bb @@ -8,6 +8,7 @@ SRC_URI += " \ file://autotools.patch \ file://miscompilation.patch \ file://toolwrapper-exithook.patch \ + file://use_libdir.patch \ " SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" -- cgit v1.2.3-54-g00ecf From 5aae7eb70b2ca58679f9e89e878b7efff5eb3d24 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 27 Nov 2012 09:20:42 -0800 Subject: log4j1.2_1.2.17.bb: Use gnujaf in oe_makeclasspath argument too Signed-off-by: Khem Raj --- recipes-core/jakarta-libs/log4j1.2_1.2.17.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 b37eb05..ec1aa55 100644 --- a/recipes-core/jakarta-libs/log4j1.2_1.2.17.bb +++ b/recipes-core/jakarta-libs/log4j1.2_1.2.17.bb @@ -3,6 +3,8 @@ AUTHOR = "Apache Software Foundation" LICENSE = "AL2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=f4ce41a6d1028498fcacde12f589bce7" +PR = "r1" + SRC_URI = "http://archive.apache.org/dist/logging/log4j/${PV}/log4j-${PV}.tar.gz" inherit java-library @@ -18,7 +20,7 @@ ALTJARFILENAMES = "log4j-1.2.jar log4j1.2.jar" do_compile() { mkdir -p build - oe_makeclasspath cp -s activation gnumail + oe_makeclasspath cp -s activation gnumail gnujaf # Built everything but the JMS and JMX classes (like in Debian) javac -sourcepath src/main/java -cp $cp -d build `find src/main/java -name "*.java" -and -not \( -iwholename "*jms*" -or -iwholename "*jmx*" \)` -- cgit v1.2.3-54-g00ecf