openjdk-6-common: Pass LD_LIBRARY_PATH to app running under qemu
PATCH 1/5 openjdk-6-common: Pass LD_LIBRARY_PATH to app running under qemu
When target and build host are same eg. x86_64 and qemux86-64 then application uses the dynamic linker from OEs sysroot but libc from the build host and they may have different versions and end up in unpleasant results.
We therefore make sure that libc is also used from OEs sysroot
--- recipes-core/openjdk/openjdk-6-common.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-core/openjdk/openjdk-6-common.inc +2 -2
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r17" +INC_PR = "r18" SRC_URI = "\ ${ICEDTEA_URI} \
@@ -242,7 +242,7 @@ EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' # Large stack is required at least on x86_64 host, otherwise random segfaults appear: -QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET}" +QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET} -E LD_LIBRARY_PATH=${STAGING_BASELIBDIR}" EXTRA_OEMAKE += 'QEMU="${QEMU}"'
Signature · 1 line
1.7.9.5
PATCH 2/5 hsqldb: Add recipe
Fixes
ERROR: Nothing PROVIDES 'hsqldb' (but meta-java/recipes-core/xml-commons/jaxme_0.5.2.bb DEPENDS on or otherwise requires it)
ERROR: Required build target 'jaxme' has no buildable providers. M
--- recipes-core/hsqldb/hsqldb_1.8.0.10.bb | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 recipes-core/hsqldb/hsqldb_1.8.0.10.bb
recipes-core/hsqldb/hsqldb_1.8.0.10.bb new file +40 -0
@@ -0,0 +1,40 @@ +DESCRIPTION = "Lightweight 100% Java SQL Database Engine" +# BSD-like +LICENSE = "HypersonicSQL" + +AUTHOR = "HSQLDB Development Group" +HOMEPAGE = "http://hsqldb.org" + +SRC_URI = "${SOURCEFORGE_MIRROR}/hsqldb/hsqldb_1_8_0_10.zip" + +S = "${WORKDIR}/${PN}" + +inherit java-library + +DEPENDS = "fastjar-native servlet2.4" + +do_compile() { + # Build instructions according to build/buildJDK14.bat + mkdir -p classes + + oe_makeclasspath cp -s servlet-api-2.4 + + javac -sourcepath src -cp $cp -d build `find src -name "*.java" -and -not -wholename "*test*"` + + mkdir -p classes/org/hsqldb/util + mkdir -p classes/org/hsqldb/util/sqltool + mkdir -p classes/org/hsqldb/resources + + cp src/org/hsqldb/util/*.gif classes/org/hsqldb/util/ + cp src/org/hsqldb/util/*.png classes/org/hsqldb/util/ + cp src/org/hsqldb/util/*.properties classes/org/hsqldb/util/ + cp src/org/hsqldb/util/sqltool/*.text classes/org/hsqldb/util/sqltool/ + + cp src/org/hsqldb/resources/*.properties classes/org/hsqldb/resources + + fastjar -C classes -c -f ${JARFILENAME} . +} + +SRC_URI[md5sum] = "17410483b5b5f267aa18b7e00b65e6e0" +SRC_URI[sha256sum] = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370" +
Signature · 1 line
1.7.9.5
Re: [meta-java][PATCH 2/5] hsqldb: Add recipe
Quoted 68 lines · Khem Raj
Fixes
ERROR: Nothing PROVIDES 'hsqldb' (but meta-java/recipes-core/xml-commons/jaxme_0.5.2.bb DEPENDS on or otherwise requires it)
ERROR: Required build target 'jaxme' has no buildable providers. MSigned-off-by Khem Raj <[email protected]>--- recipes-core/hsqldb/hsqldb_1.8.0.10.bb | 40 ++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 recipes-core/hsqldb/hsqldb_1.8.0.10.bbrecipes-core/hsqldb/hsqldb_1.8.0.10.bb new file +40
-0@@ -0,0 +1,40 @@ +DESCRIPTION = "Lightweight 100% Java SQL Database Engine" +# BSD-like +LICENSE = "HypersonicSQL" + +AUTHOR = "HSQLDB Development Group" +HOMEPAGE = "http://hsqldb.org" + +SRC_URI = "${SOURCEFORGE_MIRROR}/hsqldb/hsqldb_1_8_0_10.zip" + +S = "${WORKDIR}/${PN}" + +inherit java-library + +DEPENDS = "fastjar-native servlet2.4" + +do_compile() { + # Build instructions according to build/buildJDK14.bat + mkdir -p classes + + oe_makeclasspath cp -s servlet-api-2.4 + + javac -sourcepath src -cp $cp -d build `find src -name "*.java" -and -not -wholename "*test*"` + + mkdir -p classes/org/hsqldb/util + mkdir -p classes/org/hsqldb/util/sqltool + mkdir -p classes/org/hsqldb/resources + + cp src/org/hsqldb/util/*.gif classes/org/hsqldb/util/ + cp src/org/hsqldb/util/*.png classes/org/hsqldb/util/ + cp src/org/hsqldb/util/*.properties classes/org/hsqldb/util/ + cp src/org/hsqldb/util/sqltool/*.text classes/org/hsqldb/util/sqltool/ + + cp src/org/hsqldb/resources/*.properties classes/org/hsqldb/resources + + fastjar -C classes -c -f ${JARFILENAME} . +} + +SRC_URI[md5sum] = "17410483b5b5f267aa18b7e00b65e6e0" +SRC_URI[sha256sum] = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370" +Signature · 7 lines
1.7.9.5 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Thanks,
patch is applied to master.
Bye Henning
PATCH 3/5 openjdk-6: Fix build on ppc
In reply to Khem Raj--- .../icedtea-jdk-powerpc-atomic64.patch | 65 ++++++++++++++++++++ recipes-core/openjdk/openjdk-6-common.inc | 2 +- recipes-core/openjdk/openjdk-6-release-6b24.inc | 2 + 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch
recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch new file +65 -0
@@ -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 <bigeasy at linutronix.de> + +./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"
recipes-core/openjdk/openjdk-6-common.inc +1 -1
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r18" +INC_PR = "r19" SRC_URI = "\ ${ICEDTEA_URI} \
recipes-core/openjdk/openjdk-6-release-6b24.inc +2 -0
@@ -81,6 +81,7 @@ ICEDTEAPATCHES = "\ file://icedtea-fix-xrender.patch;apply=no \ file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \ file://icedtea-zero-hotspotfix.patch;apply=no \ + file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ " ICEDTEAPATCHES_append_libc-uclibc = " \
@@ -105,6 +106,7 @@ DISTRIBUTION_PATCHES = "\ patches/icedtea-fix-xrender.patch \ patches/icedtea-shark-arm-linux-cpu-detection.patch \ patches/icedtea-zero-hotspotfix.patch \ + patches/icedtea-jdk-powerpc-atomic64.patch \ " DISTRIBUTION_PATCHES_append_libc-uclibc = "\
Signature · 1 line
1.7.9.5
Re: [meta-java][PATCH 3/5] openjdk-6: Fix build on ppc
Quoted 120 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- .../icedtea-jdk-powerpc-atomic64.patch | 65 ++++++++++++++++++++ recipes-core/openjdk/openjdk-6-common.inc | 2 +- recipes-core/openjdk/openjdk-6-release-6b24.inc | 2 + 3 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patchrecipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-powerpc-atomic64.patch new file +65
-0@@ -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 <bigeasy at linutronix.de> + +./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"recipes-core/openjdk/openjdk-6-common.inc +1
-1@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r18" +INC_PR = "r19" SRC_URI = "\ ${ICEDTEA_URI} \recipes-core/openjdk/openjdk-6-release-6b24.inc +2
-0@@ -81,6 +81,7 @@ ICEDTEAPATCHES = "\ file://icedtea-fix-xrender.patch;apply=no \ file://icedtea-shark-arm-linux-cpu-detection.patch;apply=no \ file://icedtea-zero-hotspotfix.patch;apply=no \ + file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ " ICEDTEAPATCHES_append_libc-uclibc = " \@@ -105,6 +106,7 @@ DISTRIBUTION_PATCHES = "\ patches/icedtea-fix-xrender.patch \ patches/icedtea-shark-arm-linux-cpu-detection.patch \ patches/icedtea-zero-hotspotfix.patch \ + patches/icedtea-jdk-powerpc-atomic64.patch \ " DISTRIBUTION_PATCHES_append_libc-uclibc = "\Signature · 7 lines
1.7.9.5 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Thanks,
patch is applied to master.
Bye Henning
PATCH 4/5 jaxp1.3_1.4.01.bb: Fix SRC_URI checksums
In reply to Khem Raj--- recipes-core/xml-commons/jaxp1.3_1.4.01.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-core/xml-commons/jaxp1.3_1.4.01.bb +2 -2
@@ -27,7 +27,7 @@ do_compile() { fastjar -c -m manifest.commons -f ${JARFILENAME} -C build . } -SRC_URI[md5sum] = "5536f87a816c766f4999ed60593a8701" -SRC_URI[sha256sum] = "8e8a412aeb95644eaf14ec1a5cfd04833e38cac4a01b83d73d7de2368a35a597" +SRC_URI[md5sum] = "2fea8e97a5d4d1a24bd05f5f62f3e04e" +SRC_URI[sha256sum] = "d34bd88dc89c5c1ed2545ec5c61e4606fc28beb200a6fecf8c3ed17694181866" BBCLASSEXTEND = "native"
Signature · 1 line
1.7.9.5
Re: [meta-java][PATCH 4/5] jaxp1.3_1.4.01.bb: Fix SRC_URI checksums
Quoted 27 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- recipes-core/xml-commons/jaxp1.3_1.4.01.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)recipes-core/xml-commons/jaxp1.3_1.4.01.bb +2
-2@@ -27,7 +27,7 @@ do_compile() { fastjar -c -m manifest.commons -f ${JARFILENAME} -C build . } -SRC_URI[md5sum] = "5536f87a816c766f4999ed60593a8701" -SRC_URI[sha256sum] = "8e8a412aeb95644eaf14ec1a5cfd04833e38cac4a01b83d73d7de2368a35a597" +SRC_URI[md5sum] = "2fea8e97a5d4d1a24bd05f5f62f3e04e" +SRC_URI[sha256sum] = "d34bd88dc89c5c1ed2545ec5c61e4606fc28beb200a6fecf8c3ed17694181866" BBCLASSEXTEND = "native"Signature · 7 lines
1.7.9.5 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Thanks,
patch is applied to master. I only made qs on the openjdk-7 branch so that slipped through.
Bye Henning
PATCH 5/5 log4j1.2: Upgrade recipe to 1.2.17 release
In reply to Khem Raj--- recipes-core/jakarta-libs/log4j1.2_1.2.15.bb | 36 -------------------------- recipes-core/jakarta-libs/log4j1.2_1.2.17.bb | 35 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 36 deletions(-) delete mode 100644 recipes-core/jakarta-libs/log4j1.2_1.2.15.bb create mode 100644 recipes-core/jakarta-libs/log4j1.2_1.2.17.bb
recipes-core/jakarta-libs/log4j1.2_1.2.15.bb deleted +0 -36
@@ -1,36 +0,0 @@ -DESCRIPTION = "Java library to help the programmer output log statements to a variety of output targets" -AUTHOR = "Apache Software Foundation" -LICENSE = "AL2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f4ce41a6d1028498fcacde12f589bce7" - -SRC_URI = "http://archive.apache.org/dist/logging/log4j/${PV}/apache-log4j-${PV}.tar.gz" - -inherit java-library - -S = "${WORKDIR}/apache-log4j-${PV}" - -DEPENDS = "gnumail gnujaf" -DEPENDS_virtclass-native = "gnumail-native gnujaf-native" - - -JARFILENAME = "log4j-${PV}.jar" -ALTJARFILENAMES = "log4j-1.2.jar log4j1.2.jar" - -do_compile() { - mkdir -p build - - oe_makeclasspath cp -s activation gnumail - - # 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*" \)` - - cp -R src/main/resources/* build/ - - fastjar -C build -c -f ${JARFILENAME} . -} - -SRC_URI[md5sum] = "10f04abe4d68d5a89e8eb167e4e45e1a" -SRC_URI[sha256sum] = "f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31" - -BBCLASSEXTEND = "native" -
recipes-core/jakarta-libs/log4j1.2_1.2.17.bb new file +35 -0
@@ -0,0 +1,35 @@ +DESCRIPTION = "Java library to help the programmer output log statements to a variety of output targets" +AUTHOR = "Apache Software Foundation" +LICENSE = "AL2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f4ce41a6d1028498fcacde12f589bce7" + +SRC_URI = "http://archive.apache.org/dist/logging/log4j/${PV}/log4j-${PV}.tar.gz" + +inherit java-library + +DEPENDS = "gnumail gnujaf" +DEPENDS_virtclass-native = "gnumail-native gnujaf-native" + +S = "${WORKDIR}/apache-log4j-${PV}" + +JARFILENAME = "log4j-${PV}.jar" +ALTJARFILENAMES = "log4j-1.2.jar log4j1.2.jar" + +do_compile() { + mkdir -p build + + oe_makeclasspath cp -s activation gnumail + + # 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*" \)` + + cp -R src/main/resources/* build/ + + fastjar -C build -c -f ${JARFILENAME} . +} + +SRC_URI[md5sum] = "8218714e41ee0c6509dcfeafa2e1f53f" +SRC_URI[sha256sum] = "a528e3771ee6234661b5eb0fa02e14faee89dfec38de94088c163ddf2a0a8663" + +BBCLASSEXTEND = "native" +
Signature · 1 line
1.7.9.5
Re: [meta-java][PATCH 5/5] log4j1.2: Upgrade recipe to 1.2.17 release
Quoted 99 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- recipes-core/jakarta-libs/log4j1.2_1.2.15.bb | 36 -------------------------- recipes-core/jakarta-libs/log4j1.2_1.2.17.bb | 35 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 36 deletions(-) delete mode 100644 recipes-core/jakarta-libs/log4j1.2_1.2.15.bb create mode 100644 recipes-core/jakarta-libs/log4j1.2_1.2.17.bbrecipes-core/jakarta-libs/log4j1.2_1.2.15.bb deleted +0
-36@@ -1,36 +0,0 @@ -DESCRIPTION = "Java library to help the programmer output log statements to a variety of output targets" -AUTHOR = "Apache Software Foundation" -LICENSE = "AL2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f4ce41a6d1028498fcacde12f589bce7" - -SRC_URI = "http://archive.apache.org/dist/logging/log4j/${PV}/apache-log4j-${PV}.tar.gz" - -inherit java-library - -S = "${WORKDIR}/apache-log4j-${PV}" - -DEPENDS = "gnumail gnujaf" -DEPENDS_virtclass-native = "gnumail-native gnujaf-native" - - -JARFILENAME = "log4j-${PV}.jar" -ALTJARFILENAMES = "log4j-1.2.jar log4j1.2.jar" - -do_compile() { - mkdir -p build - - oe_makeclasspath cp -s activation gnumail - - # 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*" \)` - - cp -R src/main/resources/* build/ - - fastjar -C build -c -f ${JARFILENAME} . -} - -SRC_URI[md5sum] = "10f04abe4d68d5a89e8eb167e4e45e1a" -SRC_URI[sha256sum] = "f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31" - -BBCLASSEXTEND = "native" -recipes-core/jakarta-libs/log4j1.2_1.2.17.bb new file +35
-0@@ -0,0 +1,35 @@ +DESCRIPTION = "Java library to help the programmer output log statements to a variety of output targets" +AUTHOR = "Apache Software Foundation" +LICENSE = "AL2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f4ce41a6d1028498fcacde12f589bce7" + +SRC_URI = "http://archive.apache.org/dist/logging/log4j/${PV}/log4j-${PV}.tar.gz" + +inherit java-library + +DEPENDS = "gnumail gnujaf" +DEPENDS_virtclass-native = "gnumail-native gnujaf-native" + +S = "${WORKDIR}/apache-log4j-${PV}" + +JARFILENAME = "log4j-${PV}.jar" +ALTJARFILENAMES = "log4j-1.2.jar log4j1.2.jar" + +do_compile() { + mkdir -p build + + oe_makeclasspath cp -s activation gnumail + + # 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*" \)` + + cp -R src/main/resources/* build/ + + fastjar -C build -c -f ${JARFILENAME} . +} + +SRC_URI[md5sum] = "8218714e41ee0c6509dcfeafa2e1f53f" +SRC_URI[sha256sum] = "a528e3771ee6234661b5eb0fa02e14faee89dfec38de94088c163ddf2a0a8663" + +BBCLASSEXTEND = "native" +Signature · 7 lines
1.7.9.5 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Thanks,
patch is applied to master.
Bye Henning
Quoted 37 lines · Khem Raj
When target and build host are same eg.
x86_64and qemux86-64 then application uses the dynamic linker from OEs sysroot but libc from the build host and they may have different versions and end up in unpleasant results.We therefore make sure that libc is also used from OEs sysroot
Signed-off-by Khem Raj <[email protected]>--- recipes-core/openjdk/openjdk-6-common.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)recipes-core/openjdk/openjdk-6-common.inc +2
-2@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r17" +INC_PR = "r18" SRC_URI = "\ ${ICEDTEA_URI} \@@ -242,7 +242,7 @@ EXTRA_OEMAKE += 'OE_LAUNCHER_LDFLAGS="${OE_LAUNCHER_LDFLAGS}"' # Large stack is required at least on x86_64 host, otherwise random segfaults appear: -QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET}" +QEMU = "${@qemu_target_binary(d)} ${QEMU_OPTIONS} -s 1048576 -L ${STAGING_DIR_TARGET} -E LD_LIBRARY_PATH=${STAGING_BASELIBDIR}" EXTRA_OEMAKE += 'QEMU="${QEMU}"'Signature · 1 line
1.7.9.5
Thanks,
patch is applied to master.
Bye Henning