Re: [OE-core] [PATCH V2] libffi: Upgrade to 3.3-rc0

2019-08-16 Thread Khem Raj
On Fri, Aug 16, 2019 at 7:48 AM Richard Purdie
 wrote:
>
> On Wed, 2019-08-14 at 16:00 -0700, Khem Raj wrote:
> > libffi 3.1 release has been a bit aged and new architectures,
> > compilers
> > have since been come on stage to compile it, we have been carrying
> > patches, but its better to use the latest 3.3 rc0 which has lot of
> > these
> > issues handled and is in good shape.
> >
> > Use 3.2.1+3.3-rc0 for PV to keep room for upgrade path without PE
> > bump
> >
> > Signed-off-by: Khem Raj 
> > ---
> > v2: Set PV = 3.2.1+3.3-rc0
> >
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/960
>
> Its a multilib file conflict issue, see step5c:
>
> Running transaction test
> Error: Transaction check error:
>   file /usr/include/ffi.h from install of 
> libffi-dev-3.2.1+3.3+rc0-r0.core2_32 conflicts with file from package 
> lib64-libffi-dev-3.2.1+3.3+rc0-r0.x86_64
>

Will fix and send patch soon.
hmmm, I wonder why it did not happen in the past.
> Cheers,
>
> Richard
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH V2] libffi: Upgrade to 3.3-rc0

2019-08-16 Thread Richard Purdie
On Wed, 2019-08-14 at 16:00 -0700, Khem Raj wrote:
> libffi 3.1 release has been a bit aged and new architectures,
> compilers
> have since been come on stage to compile it, we have been carrying
> patches, but its better to use the latest 3.3 rc0 which has lot of
> these
> issues handled and is in good shape.
> 
> Use 3.2.1+3.3-rc0 for PV to keep room for upgrade path without PE
> bump
> 
> Signed-off-by: Khem Raj 
> ---
> v2: Set PV = 3.2.1+3.3-rc0
> 

https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/960

Its a multilib file conflict issue, see step5c:

Running transaction test
Error: Transaction check error:
  file /usr/include/ffi.h from install of libffi-dev-3.2.1+3.3+rc0-r0.core2_32 
conflicts with file from package lib64-libffi-dev-3.2.1+3.3+rc0-r0.x86_64

Cheers,

Richard

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH V2] libffi: Upgrade to 3.3-rc0

2019-08-14 Thread Khem Raj
libffi 3.1 release has been a bit aged and new architectures, compilers
have since been come on stage to compile it, we have been carrying
patches, but its better to use the latest 3.3 rc0 which has lot of these
issues handled and is in good shape.

Use 3.2.1+3.3-rc0 for PV to keep room for upgrade path without PE bump

Signed-off-by: Khem Raj 
---
v2: Set PV = 3.2.1+3.3-rc0

 .../libffi/0001-New-RISC-V-port-281.patch | 827 --
 .../0001-libffi-Support-musl-x32-build.patch  |  30 -
 ...e-compiler-internal-define-for-linux.patch |  32 -
 ...-mips-fix-MIPS-softfloat-build-issue.patch | 177 
 .../libffi/libffi/not-win32.patch |  10 +-
 ...ibffi_3.2.1.bb => libffi_3.2.1+3.3-rc0.bb} |  13 +-
 6 files changed, 9 insertions(+), 1080 deletions(-)
 delete mode 100644 
meta/recipes-support/libffi/libffi/0001-New-RISC-V-port-281.patch
 delete mode 100644 
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
 delete mode 100644 
meta/recipes-support/libffi/libffi/0001-mips-Use-compiler-internal-define-for-linux.patch
 delete mode 100644 
meta/recipes-support/libffi/libffi/0001-mips-fix-MIPS-softfloat-build-issue.patch
 rename meta/recipes-support/libffi/{libffi_3.2.1.bb => 
libffi_3.2.1+3.3-rc0.bb} (72%)

diff --git a/meta/recipes-support/libffi/libffi/0001-New-RISC-V-port-281.patch 
b/meta/recipes-support/libffi/libffi/0001-New-RISC-V-port-281.patch
deleted file mode 100644
index 589c4d3c44..00
--- a/meta/recipes-support/libffi/libffi/0001-New-RISC-V-port-281.patch
+++ /dev/null
@@ -1,827 +0,0 @@
-From 8ac73103bf12ce4f776940cb17f3ced15a362f23 Mon Sep 17 00:00:00 2001
-From: Stef O'Rear 
-Date: Sun, 11 Mar 2018 05:55:15 -0700
-Subject: [PATCH] New RISC-V port (#281)
-
-* Add RISC-V support
-
-This patch adds support for the RISC-V architecture (https://riscv.org).
-
-This patch has been tested using QEMU user-mode emulation and GCC 7.2.0
-in the following configurations:
-
-* -march=rv32imac -mabi=ilp32
-* -march=rv32g -mabi=ilp32d
-* -march=rv64imac -mabi=lp64
-* -march=rv64g -mabi=lp64d
-
-The ABI currently can be found at
-https://github.com/riscv/riscv-elf-psabi-doc/blob/master/riscv-elf.md .
-
-* Add RISC-V to README
-
-* RISC-V: fix configure.host
-
-Upstream-Status: Backport 
[https://github.com/libffi/libffi/commit/3840d49aaa831d649b1597518a2903dfed0d57f3]
-Signed-off-by: Alistair Francis 

- Makefile.am   |   4 +
- configure.ac  |   5 +
- src/riscv/ffi.c   | 445 ++
- src/riscv/ffitarget.h |  68 +++
- src/riscv/sysv.S  | 214 
- 5 files changed, 736 insertions(+)
- create mode 100644 src/riscv/ffi.c
- create mode 100644 src/riscv/ffitarget.h
- create mode 100644 src/riscv/sysv.S
-
-diff --git a/Makefile.am b/Makefile.am
-index 0e40451..3837650 100644
 a/Makefile.am
-+++ b/Makefile.am
-@@ -32,6 +32,7 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj   
\
-src/powerpc/asm.h src/powerpc/aix.S src/powerpc/darwin.S   \
-src/powerpc/aix_closure.S src/powerpc/darwin_closure.S \
-src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h   \
-+   src/riscv/ffi.c src/riscv/ffitarget.h src/riscv/sysv.S \
-src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h\
-src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h src/sh64/ffi.c   \
-src/sh64/sysv.S src/sh64/ffitarget.h src/sparc/v8.S\
-@@ -122,6 +123,9 @@ endif
- if MIPS
- nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
- endif
-+if RISCV
-+nodist_libffi_la_SOURCES += src/riscv/ffi.c src/riscv/sysv.S
-+endif
- if BFIN
- nodist_libffi_la_SOURCES += src/bfin/ffi.c src/bfin/sysv.S
- endif
-diff --git a/configure.ac b/configure.ac
-index ce30853..33375aa 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -226,6 +226,10 @@ case "$host" in
-   TARGET=MIPS; TARGETDIR=mips
-   ;;
- 
-+  riscv*-*-*)
-+  TARGET=RISCV; TARGETDIR=riscv
-+  ;;
-+
-   nios2*-linux*)
-   TARGET=NIOS2; TARGETDIR=nios2
-   ;;
-@@ -298,6 +302,7 @@ if test $TARGETDIR = unknown; then
- fi
- 
- AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
-+AM_CONDITIONAL(RISCV, test x$TARGET = xRISCV)
- AM_CONDITIONAL(BFIN, test x$TARGET = xBFIN)
- AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
- AM_CONDITIONAL(X86, test x$TARGET = xX86)
-diff --git a/src/riscv/ffi.c b/src/riscv/ffi.c
-new file mode 100644
-index 000..b744fdd
 /dev/null
-+++ b/src/riscv/ffi.c
-@@ -0,0 +1,445 @@
-+/* ---
-+   ffi.c - Copyright (c) 2015 Michael Knyszek 
-+ 2015 Andrew Waterman 
-+ 2018 Stef O'Rear 
-+   Based on MIPS N32/64 port
-+
-+   RISC-V Foreign Function Interface
-+
-+   Permission is hereby granted, free of charge, to any person obtaining
-+   a copy of this software and associated documentation files