[poky] [PATCH 2/2] edgerouter: libffi: fix build with soft-float tune

[Kevin Hao]

On Mon, May 09, 2016 at 05:14:41PM -0700, Ruslan Babayev wrote:
> Signed-off-by: Ruslan Babayev <ruslan at babayev.com>
> ---
>  .../recipes-support/libffi/libffi/mips-n32-soft-float.patch | 13 +++++++++++++
>  meta/recipes-support/libffi/libffi_3.2.1.bb                 |  1 +
>  2 files changed, 14 insertions(+)
>  create mode 100644 meta/recipes-support/libffi/libffi/mips-n32-soft-float.patch

I am still getting the following build errors with or without musl after
applying this patch. Did I miss something?
   /buildarea/raid0/khao/build-yocto-musl/tmp/sysroots/edgerouter/usr/lib/libffi.so: undefined reference to `ffi_closure_N32'
   /buildarea/raid0/khao/build-yocto-musl/tmp/sysroots/edgerouter/usr/lib/libffi.so: undefined reference to `ffi_call_N32'

Thanks,
Kevin

> 
> diff --git a/meta/recipes-support/libffi/libffi/mips-n32-soft-float.patch b/meta/recipes-support/libffi/libffi/mips-n32-soft-float.patch
> new file mode 100644
> index 0000000..c901614
> --- /dev/null
> +++ b/meta/recipes-support/libffi/libffi/mips-n32-soft-float.patch
> @@ -0,0 +1,13 @@
> +Index: libffi-3.2.1/src/mips/n32.S
> +===================================================================
> +--- libffi-3.2.1.orig/src/mips/n32.S
> ++++ libffi-3.2.1/src/mips/n32.S
> +@@ -30,7 +30,7 @@
> + 
> + /* Only build this code if we are compiling for n32 */	
> + 
> +-#if defined(FFI_MIPS_N32)
> ++#if defined(FFI_MIPS_N32) && !defined(__mips_soft_float)
> + 
> + #define callback a0
> + #define bytes	 a2
> diff --git a/meta/recipes-support/libffi/libffi_3.2.1.bb b/meta/recipes-support/libffi/libffi_3.2.1.bb
> index 72e25fb..5b57e79 100644
> --- a/meta/recipes-support/libffi/libffi_3.2.1.bb
> +++ b/meta/recipes-support/libffi/libffi_3.2.1.bb
> @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3610bb17683a0089ed64055416b2ae1b"
>  SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.tar.gz \
>             file://not-win32.patch \
>  	   file://0001-mips-Use-compiler-internal-define-for-linux.patch \
> +           file://mips-n32-soft-float.patch \
>  	   "
>  
>  SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
> -- 
> 2.7.4
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <http://lists.yoctoproject.org/pipermail/poky/attachments/20160510/f64017f5/attachment.pgp>