libecj-bootstrap: use sort for builder order and introduce INC_PR

* on some filesystems find orders the files to build not the
  right way, using sort seems to fix it, thanks Stefan Ring
  for the patch

* use INC_PR for better revision handling

Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>

2 files changed, 5 insertions, 1 deletions

diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc
index 6f9048f..4f85ba9 100644
--- a/recipes-core/ecj/libecj-bootstrap.inc
+++ b/recipes-core/ecj/libecj-bootstrap.inc
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/EPL-1.0;md5=57f8d5e2b3e98ac6e08
 
 DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
 
+INC_PR = "r5"
+
 inherit native java
 
 S = "${WORKDIR}"
@@ -47,7 +49,7 @@ do_unpackpost() {
 addtask unpackpost after do_unpack before do_patch
 
 do_compile() {
-  find source -name '*.java' > sourcefiles
+  find source -name '*.java' | LC_ALL=C sort > sourcefiles
   split -l 25 sourcefiles ecj-sources.
 
   # Compiling in place is done because the sources contain
diff --git a/recipes-core/ecj/libecj-bootstrap_3.6.2.bb b/recipes-core/ecj/libecj-bootstrap_3.6.2.bb
index 98edc01..d890f10 100644
--- a/recipes-core/ecj/libecj-bootstrap_3.6.2.bb
+++ b/recipes-core/ecj/libecj-bootstrap_3.6.2.bb
@@ -1,5 +1,7 @@
 require libecj-bootstrap.inc
 
+PR = "${INC_PR}.0"
+
 SRC_URI = " http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.6.2-201102101200/ecjsrc-${PV}.zip"
 
 SRC_URI[md5sum] = "3f3ca1973dd7a21780525c9ffba7a263"