Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions recipes-core/ant/ant-native_1.8.1.bb
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ do_compile() {

oe_makeclasspath cp -s ecj-bootstrap jsch bsf xalan2 xercesImpl resolver gnumail gnujaf bcel regexp log4j1.2 antlr oro junit jdepend commons-net commons-logging
cp=${STAGING_DATADIR_JAVA_NATIVE}/ant.jar:${STAGING_DATADIR}/classpath/tools.zip:$cp
sed -i -e"s|@JAR_FILE@|$cp|" ${WORKDIR}/ant
sed -i -e"s|@JAR_FILE@|$cp|" ${UNPACKDIR}/ant
}

do_install:append() {
install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/ant ${D}${bindir}
install -m 0755 ${UNPACKDIR}/ant ${D}${bindir}
}

SRC_URI[sha256sum] = "4f39057af228663c3cfb6dcfbee603a071a7e3cf48c95c30869ed81c5fcf21c8"
Expand Down
4 changes: 2 additions & 2 deletions recipes-core/antlr/antlr_2.7.7.bb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SRC_URI:append:class-native = " file://runantlr"
inherit java-library

do_configure:class-native() {
sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${WORKDIR}/runantlr
sed -i -e"s|@JAR_FILE@|${STAGING_DATADIR_JAVA_NATIVE}/antlr.jar|" ${UNPACKDIR}/runantlr
}

do_compile() {
Expand All @@ -23,7 +23,7 @@ do_compile() {

do_install:class-native() {
install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/runantlr ${D}${bindir}/
install -m 0755 ${UNPACKDIR}/runantlr ${D}${bindir}/
}

SRC_URI[sha256sum] = "853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SUMMARY = "Common CA certificates (JKS trustStore)"
DESCRIPTION = "This package uses the hooks of the ca-certificates \
package to update the cacerts JKS trustStore used for many java runtimes."
LICENSE = "GPLv2+"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "\
file://debian/copyright;md5=ab0f6b6900f6564dc3e273dfa36fcc72 \
file://src/main/java/org/debian/security/InvalidKeystorePasswordException.java;endline=17;md5=f9150bf1ca3139a38ddb54f9e1c0eb9b \
Expand Down Expand Up @@ -67,7 +67,7 @@ do_install () {
oe_jarinstall ${JARFILENAME}

mkdir -p ${D}${sysconfdir}/ssl/certs/java
install -Dm0755 ${WORKDIR}/${BPN}.hook.in ${D}${sysconfdir}/ca-certificates/update.d/${BPN}-hook
install -Dm0755 ${UNPACKDIR}/${BPN}.hook.in ${D}${sysconfdir}/ca-certificates/update.d/${BPN}-hook
sed -e 's|@@datadir_java@@|${datadir_java}|' \
-e 's|@@libdir_jvm@@|${libdir_jvm}|' \
-e 's|@@JARFILENAME@@|${JARFILENAME}|' \
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/cacao/files/cacao-0.98-initial.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

Index: cacao-0.98/configure.ac
===================================================================
--- cacao-0.98.orig/configure.ac 2007-12-19 22:07:55.000000000 +0100
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/cacao/files/disable_hw_exceptions.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

Index: cacao-0.98/src/vm/exceptions.c
===================================================================
--- cacao-0.98.orig/src/vm/exceptions.c 2007-06-05 09:41:07.000000000 +0200
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/classpath/classpath-0.93/autotools.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [dead project]

Index: classpath-0.93/configure.ac
===================================================================
--- classpath-0.93.orig/configure.ac 2006-12-08 20:22:50.000000000 +0100
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/classpath/classpath-0.93/miscompilation.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [dead project]

Index: classpath-0.93/native/jni/java-io/java_io_VMFile.c
===================================================================
--- classpath-0.93.orig/native/jni/java-io/java_io_VMFile.c 2006-09-23 07:17:45.000000000 +0200
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/classpath/classpath-0.99/autotools.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [dead project]

Index: classpath-0.99/configure.ac
===================================================================
--- classpath-0.99.orig/configure.ac 2012-03-08 19:03:15.000000000 +0100
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/classpath/classpath-0.99/ecj_java_dir.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [dead project]

Index: classpath-0.98/lib/gen-classlist.sh.in
===================================================================
--- classpath-0.98.orig/lib/gen-classlist.sh.in 2010-06-24 21:18:02.776819217 +0200
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/classpath/classpath-0.99/freetype2.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [dead project]

Index: classpath-0.99/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c
===================================================================
--- classpath-0.99.orig/native/jni/gtk-peer/gnu_java_awt_peer_gtk_FreetypeGlyphVector.c 2014-02-10 12:01:26.826613065 +0100
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/classpath/classpath-0.99/miscompilation.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [dead project]

Index: classpath-0.97.2/native/jni/java-io/java_io_VMFile.c
===================================================================
--- classpath-0.97.2.orig/native/jni/java-io/java_io_VMFile.c 2008-10-10 15:24:54.000000000 +0200
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [dead project]

Index: gnu/classpath/debug/Simple1LineFormatter.java
===================================================================
--- gnu/classpath/debug/Simple1LineFormatter.java.orig 2006-07-11 18:03:59.000000000 +0200
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [dead project]

Index: classpath-0.97.2/tools/toolwrapper.c
===================================================================
--- classpath-0.97.2.orig/tools/toolwrapper.c 2006-12-13 18:56:44.000000000 +0100
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/classpath/classpath-0.99/use_libdir.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [dead project]

on some arches we use lib64 for libdir so hardcoding to lib
is not gonna work always

Expand Down
2 changes: 2 additions & 0 deletions recipes-core/classpathx/gnujaf-1.1.1/datadir_java.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

Index: activation-1.1.1/Makefile.am
===================================================================
--- activation-1.1.1.orig/Makefile.am 2008-03-01 10:30:06.000000000 +0100
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/classpathx/gnumail-1.1.2/datadir_java.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

Index: mail-1.1.2/Makefile.am
===================================================================
--- mail-1.1.2.orig/Makefile.am 2008-03-01 11:13:36.000000000 +0100
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/classpathx/inetlib-1.1.1/datadir_java.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

Index: inetlib-1.1.1/Makefile.am
===================================================================
--- inetlib-1.1.1.orig/Makefile.am 2008-03-01 10:49:49.000000000 +0100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Fix a dependency for intermittent build failures, e.g.:
1. ERROR in source/gnu/inet/util/SaslCallbackHandler.java (at line 43)
import javax.security.auth.callback.Callback;
^^^^^^^^^^^^^^
Upstream-Status: Inappropriate [dead project]

Signed-off-by: Paul Barrette <[email protected]>
---
Expand Down
6 changes: 3 additions & 3 deletions recipes-core/cup/cup_0.10k.bb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SUMMARY = "Lexical analyzer generator for Java"
AUTHOR = "Elliot Berk, A. Appel, C. Scott Ananian"
LICENSE = "CUP"
LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c33"
LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=2c9db91c00f38e52cfc8e67bafaa7c33"


RDEPENDS:${PN} = "java2-runtime"
Expand All @@ -21,7 +21,7 @@ do_configure() {
-e "s|OE_STAGING_BINDIR|${bindir}|" \
-e "s|OE_STAGING_DATADIR_JAVA|${data_java}|" \
-e "s|OE_CUP_JAR|${BP}.jar|" \
${WORKDIR}/cup
${UNPACKDIR}/cup
}

do_compile() {
Expand All @@ -34,7 +34,7 @@ do_compile() {

do_install:append() {
install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/cup ${D}${bindir}
install -m 0755 ${UNPACKDIR}/cup ${D}${bindir}
}

PACKAGES = "${PN}"
Expand Down
3 changes: 2 additions & 1 deletion recipes-core/ecj/ecj-bootstrap-native.bb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ PROVIDES = "virtual/javac-native"

SRC_URI = "file://ecj.in"

S = "${WORKDIR}"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

JAR = "ecj-bootstrap.jar"

Expand Down
3 changes: 2 additions & 1 deletion recipes-core/ecj/ecj-initial-native.bb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ DEPENDS = "libecj-bootstrap-native"

SRC_URI = "file://ecj-initial.in"

S = "${WORKDIR}"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

inherit native

Expand Down
3 changes: 2 additions & 1 deletion recipes-core/ecj/libecj-bootstrap.inc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ INC_PR = "r5"

inherit java native

S = "${WORKDIR}"
S = "${WORKDIR}/sources"
UNPACKDIR = "${S}"

JAR = "ecj-bootstrap-${PV}.jar"

Expand Down
2 changes: 2 additions & 0 deletions recipes-core/fastjar/fastjar/jartool.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [dead project]

Index: fastjar-0.98/jartool.c
===================================================================
--- fastjar-0.98.orig/jartool.c 2009-09-07 00:10:47.000000000 +0200
Expand Down
8 changes: 4 additions & 4 deletions recipes-core/icedtea/icedtea7-native.inc
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ do_configure:prepend() {

# Automatically copy everything that starts with "icedtea" and ends with
# ".patch" into the patches directory.
find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \;
find ${UNPACKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \;

# Prepare JDK-like directory with Classpath' files which we can treat as a
# SYSTEM_GCJ_DIR afterwards.
Expand Down Expand Up @@ -154,9 +154,9 @@ do_configure:append() {
${POST_CONFIGURE_CLEAN_X11}
oe_runmake patch-boot

patch -p1 < ${WORKDIR}/jaxws_fix_NullPointerException.patch
patch -p1 < ${WORKDIR}/sigsegv.patch
patch -p1 < ${WORKDIR}/vframeArray_Fix_sigsegv.patch
patch -p1 < ${UNPACKDIR}/jaxws_fix_NullPointerException.patch
patch -p1 < ${UNPACKDIR}/sigsegv.patch
patch -p1 < ${UNPACKDIR}/vframeArray_Fix_sigsegv.patch
}

EXTRA_OEMAKE = ' \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

--- acinclude.m4.orig 2015-08-18 11:58:23.000000000 +0200
+++ acinclude.m4 2015-08-18 11:58:30.000000000 +0200
@@ -2178,3 +2178,37 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

Index: icedtea-2.1/Makefile.am
===================================================================
--- icedtea-2.1.orig/Makefile.am
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

Index: icedtea-2.1.3/configure.ac
===================================================================
--- icedtea-2.1.3.orig/configure.ac 2012-10-17 10:18:59.262849964 +0200
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

--- icedtea-2.1.3/Makefile.am 2016-10-18 15:31:45.451073805 +0200
+++ icedtea-2.1.3/Makefile.am 2016-10-18 15:42:14.651066400 +0200
@@ -12,13 +12,13 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

--- openjdk/hotspot/make/linux/makefiles/gcc.make 2015-04-02 08:02:31.301728214 +0200
+++ openjdk/hotspot/make/linux/makefiles/gcc.make.new 2015-04-02 08:19:55.502171268 +0200
@@ -233,7 +233,7 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

diff --git openjdk/corba/make/Makefile openjdk/corba/make/Makefile
index aef5c1b..62e2216 100644
--- openjdk/corba/make/Makefile
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

--- openjdk/jdk/make/common/Release.gmk.orig 2015-08-20 10:08:34.631526528 +0200
+++ openjdk/jdk/make/common/Release.gmk 2015-08-20 10:10:13.823526901 +0200
@@ -340,7 +340,6 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

--- openjdk/jdk/make/sun/awt/FILES_c_unix.gmk.orig 2015-08-19 11:53:47.209867982 +0200
+++ openjdk/jdk/make/sun/awt/FILES_c_unix.gmk 2015-08-19 11:57:48.677868529 +0200
@@ -207,12 +207,6 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

diff --git openjdk/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk
index 27fe5bd..97ad549 100644
--- openjdk/jdk/make/common/Sanity.gmk
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/icedtea/openjdk-7-03b147/icedtea-flags.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

diff --git openjdk/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile
index 25d43ae..ac3de8b 100644
--- openjdk/hotspot/agent/src/os/linux/Makefile
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

--- openjdk/hotspot/src/share/vm/code/relocInfo.hpp
+++ openjdk/hotspot/src/share/vm/code/relocInfo.hpp
@@ -371,7 +371,7 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Backport

# HG changeset patch
# User Andreas Obergschwandtner <[email protected]>
# Date 1534928526 -7200
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ From: Henning Heinold <[email protected]>
Date: Wed, 14 Mar 2012 22:15:47 +0100
Subject: [PATCH] foo

Upstream-Status: Backport

---
hotspot/agent/make/saenv.sh | 4 +-
hotspot/make/defs.make | 4 +-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

--- openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
+++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c
@@ -37,7 +37,7 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
@@ -35,7 +35,7 @@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ From: Henning Heinold <[email protected]>
Date: Wed, 14 Mar 2012 22:34:51 +0100
Subject: [PATCH] real patch

Upstream-Status: Backport

---
jdk/make/common/shared/Compiler-gcc.gmk | 4 +-
jdk/make/common/shared/Platform.gmk | 18 ++++------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2102,7 +2102,7 @@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Date: Wed, 31 Dec 2014 16:07:32 +0100
Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration
date

Upstream-Status: Backport

Signed-off-by: Alex Gonzalez <[email protected]>
---
.../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 ---
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Backport

Index: icedtea-2.1/acinclude.m4
===================================================================
--- icedtea-2.1.orig/acinclude.m4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Backport

--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
+++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
@@ -26,13 +26,11 @@
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/icedtea/openjdk-7-03b147/sigsegv.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Backport

diff --git a/openjdk-boot/hotspot/src/share/vm/runtime/thread.cpp b/openjdk-boot/hotspot/src/share/vm/runtime/thread.cpp
index 8b7059c8389f..67e9e7bd4bce 100644
--- a/openjdk-boot/hotspot/src/share/vm/runtime/thread.cpp
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/icedtea/openjdk-7-03b147/timezoneszip.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Backport

diff --git a/Makefile.am b/Makefile.am
index 5eaff4c40aac..a4f0f63f3e43 100644
--- a/Makefile.am
Expand Down
2 changes: 1 addition & 1 deletion recipes-core/jakarta-libs/avalon-framework-api_4.3.bb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ do_compile() {
mkdir -p build

# Allow reaching method definitions from logkit (stupid cyclic dependency).
srcpath=src/java:${WORKDIR}/logkit-1.2.2-dev/src/java
srcpath=src/java:${UNPACKDIR}/logkit-1.2.2-dev/src/java

javac -encoding ISO-8859-1 -sourcepath $srcpath -d build `find src/java -name "*.java"`

Expand Down
2 changes: 2 additions & 0 deletions recipes-core/jamvm/jamvm-1.4.5/jamvm-initial.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

Index: jamvm-1.4.5/configure.ac
===================================================================
--- jamvm-1.4.5.orig/configure.ac
Expand Down
2 changes: 2 additions & 0 deletions recipes-core/jamvm/jamvm-1.4.5/libffi.patch
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [Yocto-specific fixes]

Index: jamvm-1.4.5/configure.ac
===================================================================
--- jamvm-1.4.5.orig/configure.ac 2007-02-05 04:18:05.000000000 +0100
Expand Down
Loading