[oe] [PATCH 05/12][oe-classic] ecj-inital: rename recipe to ecj-initial-native

Henning Heinold heinold at inf.fu-berlin.de
Sat Feb 18 21:20:15 UTC 2012


Signed-off-by: Henning Heinold <heinold at inf.fu-berlin.de>
---
 recipes/cacao/cacao-native.inc                     |    2 +-
 recipes/classpath/classpath-native.inc             |    2 +-
 recipes/ecj/ecj-initial-native.bb                  |   35 ++++++++++++++++++++
 recipes/ecj/ecj-initial.bb                         |   35 --------------------
 recipes/jamvm/jamvm-native.inc                     |    2 +-
 .../openjdk-langtools-native_0.0+jdk7-b31.bb       |    2 +-
 6 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 recipes/ecj/ecj-initial-native.bb
 delete mode 100644 recipes/ecj/ecj-initial.bb

diff --git a/recipes/cacao/cacao-native.inc b/recipes/cacao/cacao-native.inc
index 8501634..aceee2b 100644
--- a/recipes/cacao/cacao-native.inc
+++ b/recipes/cacao/cacao-native.inc
@@ -4,7 +4,7 @@ LICENSE  = "GPL"
 PRIORITY = "optional"
 SECTION  = "interpreters"
 
-DEPENDS = "zlib-native libtool-native classpath-native ecj-initial fastjar-native"
+DEPENDS = "zlib-native libtool-native classpath-native ecj-initial-native fastjar-native"
 
 PROVIDES = "virtual/java-native"
 
diff --git a/recipes/classpath/classpath-native.inc b/recipes/classpath/classpath-native.inc
index a3ff439..0ebf608 100644
--- a/recipes/classpath/classpath-native.inc
+++ b/recipes/classpath/classpath-native.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "GNU Classpath standard Java libraries - For native Java-dependent programs"
 HOMEPAGE = "http://www.gnu.org/software/classpath/"
 LICENSE = "Classpath"
-DEPENDS = "ecj-initial fastjar-native zip-native"
+DEPENDS = "ecj-initial-native fastjar-native zip-native"
 
 inherit autotools native
 
diff --git a/recipes/ecj/ecj-initial-native.bb b/recipes/ecj/ecj-initial-native.bb
new file mode 100644
index 0000000..1809cd6
--- /dev/null
+++ b/recipes/ecj/ecj-initial-native.bb
@@ -0,0 +1,35 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+
+# This variant runs on the initial (not Java5-compatible runtime).
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+LICENSE = "EPL"
+
+DEPENDS = "libecj-bootstrap"
+
+PR = "r2"
+
+SRC_URI = "file://ecj-initial.in"
+
+NATIVE_INSTALL_WORKS = "1"
+
+S = "${WORKDIR}"
+
+inherit native
+
+JAR = "ecj-bootstrap.jar"
+
+do_compile() {
+  # Create the start script
+  echo "#!/bin/sh" > ecj-initial
+  echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+  echo "RUNTIME=java-initial" >> ecj-initial
+  cat ecj-initial.in >> ecj-initial
+}
+
+do_install() {
+  install -d ${D}${bindir}
+  install -m 755 ${S}/ecj-initial ${D}${bindir}
+}
diff --git a/recipes/ecj/ecj-initial.bb b/recipes/ecj/ecj-initial.bb
deleted file mode 100644
index 1809cd6..0000000
--- a/recipes/ecj/ecj-initial.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
-# and no less features.
-
-# This variant runs on the initial (not Java5-compatible runtime).
-
-DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
-HOMEPAGE = "http://www.eclipse.org/"
-LICENSE = "EPL"
-
-DEPENDS = "libecj-bootstrap"
-
-PR = "r2"
-
-SRC_URI = "file://ecj-initial.in"
-
-NATIVE_INSTALL_WORKS = "1"
-
-S = "${WORKDIR}"
-
-inherit native
-
-JAR = "ecj-bootstrap.jar"
-
-do_compile() {
-  # Create the start script
-  echo "#!/bin/sh" > ecj-initial
-  echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
-  echo "RUNTIME=java-initial" >> ecj-initial
-  cat ecj-initial.in >> ecj-initial
-}
-
-do_install() {
-  install -d ${D}${bindir}
-  install -m 755 ${S}/ecj-initial ${D}${bindir}
-}
diff --git a/recipes/jamvm/jamvm-native.inc b/recipes/jamvm/jamvm-native.inc
index 853c38d..ce227aa 100644
--- a/recipes/jamvm/jamvm-native.inc
+++ b/recipes/jamvm/jamvm-native.inc
@@ -1,6 +1,6 @@
 require jamvm.inc 
 
-DEPENDS = "zlib-native classpath-native ecj-initial libffi-native"
+DEPENDS = "zlib-native classpath-native ecj-initial-native libffi-native"
 RDEPENDS_${PN} = ""
 
 PROVIDES = "virtual/java-native"
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
index 39b6dd9..45af116 100644
--- a/recipes/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb
+++ b/recipes/openjdk-langtools/openjdk-langtools-native_0.0+jdk7-b31.bb
@@ -4,7 +4,7 @@ LICENSE  = "GPL"
 
 PR = "r3"
 
-DEPENDS = "classpath-native fastjar-native ecj-initial virtual/java-native"
+DEPENDS = "classpath-native fastjar-native ecj-initial-native virtual/java-native"
 
 S = "${WORKDIR}/icepick-0.0+hg20080118"
 
-- 
1.7.9




More information about the Openembedded-devel mailing list