From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- .../files/0.0+jdk7-b31-build-fix.patch | 114 +++++++++++++++++++++ .../openjdk-javac-native_0.0+jdk7-b31.bb | 15 +++ .../openjdk-langtools-native_0.0+jdk7-b31.bb | 45 ++++++++ 3 files changed, 174 insertions(+) create mode 100644 recipes/openjdk-langtools/files/0.0+jdk7-b31-build-fix.patch create mode 100644 recipes/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb create mode 100644 recipes/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb (limited to 'recipes/openjdk-langtools') diff --git a/recipes/openjdk-langtools/files/0.0+jdk7-b31-build-fix.patch b/recipes/openjdk-langtools/files/0.0+jdk7-b31-build-fix.patch new file mode 100644 index 0000000000..147dab520e --- /dev/null +++ b/recipes/openjdk-langtools/files/0.0+jdk7-b31-build-fix.patch @@ -0,0 +1,114 @@ +Index: icepick-0.0+hg20080118/Makefile.am +=================================================================== +--- icepick-0.0+hg20080118.orig/Makefile.am ++++ icepick-0.0+hg20080118/Makefile.am +@@ -19,55 +19,61 @@ else + JCOMPILER = echo "No compiler found" 1>&2; exit 1 + endif + +-# All our example java source files ++# Go into $(LANGTOOLS_SRC_DIR)/src/share/classes and set ++# TOOLS_JAVA_FILES to the output of ++# find . -mindepth 2 -type d -and -not -wholename "*resources" -printf \$\(OPENJDK_CLASSES\)/%P/\*.java' \\'\\n ++# (btw: xclip is your friend) + OPENJDK_CLASSES = $(LANGTOOLS_SRC_DIR)/src/share/classes +-TOOLS_JAVA_FILES = $(OPENJDK_CLASSES)/com/sun/tools/apt/Main.java \ +- $(OPENJDK_CLASSES)/com/sun/javadoc/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/apt/comp/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/apt/main/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/apt/util/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/apt/mirror/apt/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/apt/mirror/type/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/apt/mirror/util/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/apt/mirror/declaration/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/apt/mirror/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/api/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/jvm/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/sym/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/code/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/comp/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/main/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/tree/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/util/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/model/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/parser/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/processing/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javac/zip/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javah/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/javadoc/*.java \ +- $(OPENJDK_CLASSES)/com/sun/mirror/apt/*.java \ +- $(OPENJDK_CLASSES)/com/sun/mirror/type/*.java \ +- $(OPENJDK_CLASSES)/com/sun/mirror/util/*.java \ +- $(OPENJDK_CLASSES)/com/sun/mirror/declaration/*.java \ +- $(OPENJDK_CLASSES)/com/sun/source/tree/*.java \ +- $(OPENJDK_CLASSES)/com/sun/source/util/*.java \ +- $(OPENJDK_CLASSES)/javax/lang/model/type/*.java \ +- $(OPENJDK_CLASSES)/javax/lang/model/util/*.java \ +- $(OPENJDK_CLASSES)/javax/lang/model/*.java \ +- $(OPENJDK_CLASSES)/javax/lang/model/element/*.java \ +- $(OPENJDK_CLASSES)/javax/tools/*.java \ +- $(OPENJDK_CLASSES)/javax/annotation/processing/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/doclets/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/doclets/formats/html/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/doclets/formats/html/markup/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/builders/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/taglets/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/util/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/util/links/*.java \ +- $(OPENJDK_CLASSES)/com/sun/tools/doclets/standard/*.java \ +- $(OPENJDK_CLASSES)/sun/tools/javap/*.java ++TOOLS_JAVA_FILES = \ ++ $(OPENJDK_CLASSES)/sun/tools/javap/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javap/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javadoc/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/apt/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/apt/comp/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/apt/util/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/apt/main/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/apt/mirror/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/apt/mirror/declaration/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/apt/mirror/apt/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/apt/mirror/util/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/apt/mirror/type/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javah/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/comp/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/file/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/model/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/code/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/tree/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/api/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/util/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/jvm/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/processing/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/parser/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/sym/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/javac/main/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/classfile/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/doclets/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/doclets/standard/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/builders/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/util/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/util/links/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/doclets/internal/toolkit/taglets/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/doclets/formats/html/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/tools/doclets/formats/html/markup/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/javadoc/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/source/tree/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/source/util/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/mirror/declaration/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/mirror/apt/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/mirror/util/*.java \ ++ $(OPENJDK_CLASSES)/com/sun/mirror/type/*.java \ ++ $(OPENJDK_CLASSES)/javax/tools/*.java \ ++ $(OPENJDK_CLASSES)/javax/annotation/processing/*.java \ ++ $(OPENJDK_CLASSES)/javax/lang/model/*.java \ ++ $(OPENJDK_CLASSES)/javax/lang/model/element/*.java \ ++ $(OPENJDK_CLASSES)/javax/lang/model/util/*.java \ ++ $(OPENJDK_CLASSES)/javax/lang/model/type/*.java + + # The zip files with classes we want to produce. + TOOLS_ZIP = tools.jar diff --git a/recipes/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb b/recipes/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb new file mode 100644 index 0000000000..1e3e1f8259 --- /dev/null +++ b/recipes/openjdk-langtools/openjdk-javac-native_0.0+jdk7-b31.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Java compiler from the OpenJDK project" +HOMEPAGE = "http://http://openjdk.java.net/groups/compiler" +LICENSE = "GPL" + +PR = "r1" + +DEPENDS = "openjdk-langtools-native" + +PROVIDES = "virtual/javac-native" + +inherit native + +do_stage() { + ln -sf sun-javac ${bindir}/javac +} diff --git a/recipes/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb b/recipes/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb new file mode 100644 index 0000000000..abeea96a0a --- /dev/null +++ b/recipes/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "Java Language tools (sun-javac, javah, javap, javadoc and apt) from OpenJDK" +HOMEPAGE = "http://http://openjdk.java.net/groups/compiler" +LICENSE = "GPL" + +PR = "r3" + +DEPENDS = "classpath-native fastjar-native ecj-initial virtual/java-native" + +S = "${WORKDIR}/icepick-0.0+hg20080118" + +SRC_URI = "\ + http://jalimo.evolvis.org/repository/sources/icepick-0.0+hg20080118.tar.bz2;md5sum=ce7b1827e6f4cbe73b9ffa90b0d45a6a \ + http://jalimo.evolvis.org/repository/sources/openjdk-langtools-jdk7-b31.tar.bz2;md5sum=670931f67b2e4ac46c6e0cd15418f2fa \ + file://${PV}-build-fix.patch;patch=1 \ + " + +inherit java autotools native + +EXTRA_OECONF = "\ + --with-javac=${STAGING_BINDIR}/ecj-initial \ + --with-vm=${STAGING_BINDIR}/java \ + --with-fastjar=${STAGING_BINDIR}/fastjar \ + --with-classpath=${STAGING_DATADIR}/classpath/glibj.zip \ + --with-langtools-src-dir=${WORKDIR}/openjdk-langtools-jdk7-b31 \ + " + +export JAVAC_OPTS="-bootclasspath ${STAGING_DATADIR_JAVA}/share/classpath/glibj.zip -source 5.0" + +do_stage() { + # Do install step manually to fine control installation names. + install -d ${bindir} + install -m 0755 tools/apt ${bindir} + install -m 0755 tools/javadoc ${bindir} + install -m 0755 tools/javah ${bindir} + install -m 0755 tools/javap ${bindir} + + # Provide javac as sun-javac to not clash with the binary of the same + # name in ecj-bootstrap-native. + # This way ecj-bootstrap-native and openjdk-langtools-native can coexist + # in staging dir. + install -m 0755 tools/javac ${bindir}/sun-javac + + install -d ${libdir} + install -m 0644 tools.jar ${libdir} +} -- cgit v1.2.3