chicken: Fix cross and target builds and move 4.4.0 to 4.6.0 release

Signed-off-by: Khem Raj <raj.khem@gmail.com>

6 files changed, 32 insertions, 17 deletions

diff --git a/recipes/chicken/chicken-cross_4.4.0.bb b/recipes/chicken/chicken-cross_4.6.0.bb
index 583e02f210..23d1745c02 100644
--- a/recipes/chicken/chicken-cross_4.4.0.bb
+++ b/recipes/chicken/chicken-cross_4.6.0.bb
@@ -1,10 +1,9 @@
 require chicken.inc
 
-SRC_URI[md5sum] = "598e7ea036807a67297c3e2bf4a454c4"
-SRC_URI[sha256sum] = "2578dcd041d864f8c6d83c1f84023cd1be8287a9c71c3f4d91679186231e6cfd"
-
-PR = "${INC_PR}.1"
-
+PR = "${INC_PR}.0"
+SRC_URI = "http://code.call-cc.org/releases/${PV}/chicken-${PV}.tar.gz"
+SRC_URI[md5sum] = "538a93e786e550ad848a040bcd902184"
+SRC_URI[sha256sum] = "c55d1dadf9941b3efbc7be9181d5c7cbc304a20c614625fbf710c0acaa1cd245"
 inherit cross
 
 do_compile() {
diff --git a/recipes/chicken/chicken.inc b/recipes/chicken/chicken.inc
index 178a41f427..6988cbb555 100644
--- a/recipes/chicken/chicken.inc
+++ b/recipes/chicken/chicken.inc
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 LICENSE = "BSD"
 INC_PR = "r3"
 
-SRC_URI = "http://chicken.wiki.br/releases/${PV}/chicken-${PV}.tar.gz \
+SRC_URI = "http://code.call-cc.org/releases/${PV}/chicken-${PV}.tar.gz \
            file://soname.patch \
            file://translator-cross.patch"
 
diff --git a/recipes/chicken/chicken/arm_c_do_apply_hack_dummy.patch b/recipes/chicken/chicken/arm_c_do_apply_hack_dummy.patch
new file mode 100644
index 0000000000..18e41514a7
--- /dev/null
+++ b/recipes/chicken/chicken/arm_c_do_apply_hack_dummy.patch
@@ -0,0 +1,17 @@
+Index: chicken-4.6.0/defaults.make
+===================================================================
+--- chicken-4.6.0.orig/defaults.make
++++ chicken-4.6.0/defaults.make
+@@ -274,10 +274,12 @@ POSIXFILE ?= posixunix
+ CHICKEN_CONFIG_H = chicken-config.h
+ 
+ ifneq ($(ARCH),)
++ifneq ($(ARCH),arm)
+ HACKED_APPLY ?= 1
+ APPLY_HACK_SRC ?= apply-hack.$(ARCH)$(ASM)
+ APPLY_HACK_OBJECT ?= apply-hack.$(ARCH)$(O)
+ endif
++endif
+ 
+ ifeq ($(HACKED_APPLY),)
+ APPLY_HACK_OBJECT =
diff --git a/recipes/chicken/chicken-4.2.0/soname.patch b/recipes/chicken/chicken/soname.patch
index 3126c64d3e..3126c64d3e 100644
--- a/recipes/chicken/chicken-4.2.0/soname.patch
+++ b/recipes/chicken/chicken/soname.patch
diff --git a/recipes/chicken/chicken-4.2.0/translator-cross.patch b/recipes/chicken/chicken/translator-cross.patch
index ac0dde9aec..ac0dde9aec 100644
--- a/recipes/chicken/chicken-4.2.0/translator-cross.patch
+++ b/recipes/chicken/chicken/translator-cross.patch
diff --git a/recipes/chicken/chicken_4.4.0.bb b/recipes/chicken/chicken_4.6.0.bb
index 135e34c166..df76bff99f 100644
--- a/recipes/chicken/chicken_4.4.0.bb
+++ b/recipes/chicken/chicken_4.6.0.bb
@@ -1,22 +1,21 @@
 require chicken.inc
-
-SRC_URI[md5sum] = "598e7ea036807a67297c3e2bf4a454c4"
-SRC_URI[sha256sum] = "2578dcd041d864f8c6d83c1f84023cd1be8287a9c71c3f4d91679186231e6cfd"
-
+SRC_URI = "http://code.call-cc.org/releases/${PV}/chicken-${PV}.tar.gz \
+           file://arm_c_do_apply_hack_dummy.patch \
+          "
+SRC_URI[md5sum] = "538a93e786e550ad848a040bcd902184"
+SRC_URI[sha256sum] = "c55d1dadf9941b3efbc7be9181d5c7cbc304a20c614625fbf710c0acaa1cd245"
 DEPENDS = "chicken-cross"
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.0"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_compile() {
-    make PLATFORM="linux" DESTDIR="${D}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH}
+    make PLATFORM="linux" DESTDIR="${D}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} C_COMPILER="${CC}"
 }
 
 do_install() {
-    make PLATFORM="linux" DESTDIR="${D}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} install
-}
-
-do_stage() {
-    make PLATFORM="linux" DESTDIR="${STAGING_DIR_TARGET}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} install
+    make PLATFORM="linux" DESTDIR="${D}" PREFIX="${prefix}" HOSTSYSTEM="${TARGET_SYS}" ARCH=${CHICKEN_ARCH} C_COMPILER="${CC}" install
 }
 
 PACKAGES += "chicken-bin libchicken libuchicken"