Skip to contentSkip to conversation

Support combination of MUSL and x32 build

PATCH Superseded [email protected] 4 participants 15 messages Jul 6, 2017

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover Support combination of MUSL and x32 build

From: sweeaun <[email protected]>

Modified infrastructure (bbclass) and fixed bugs on multiple recipes to enable combination of MUSL and x32 build.

The following changes since commit 98099349e358a9caaec8ec81f0d4abe588909cfe:

bitbake: npm fetcher: fix unknown variable name. (2017-06-29 14:33:42 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib sweeaun/musl_x32_support
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sweeaun/musl_x32_support

sweeaun (7):
insane.bbclass: Support musl-x32
siteinfo.bbclass: Support musl-x32
gnu-efi: Support musl-x32 build
grub-efi: Support musl-x32
openssl: Support musl-x32 build
perl: Support musl-x32 build
libffi: Support musl-x32 build

 meta/classes/insane.bbclass                        |  5 +++-
 meta/classes/siteinfo.bbclass                      |  2 ++
 meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb          |  1 +
 meta/recipes-bsp/grub/grub-efi_2.02.bb             |  2 ++
 meta/recipes-connectivity/openssl/openssl.inc      |  6 +++--
 meta/recipes-devtools/perl/perl_5.24.1.bb          |  2 +-
 .../0001-libffi-Support-musl-x32-build.patch       | 29 ++++++++++++++++++++++
 meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +
 8 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/7 insane.bbclass: Support musl-x32

From: sweeaun <[email protected]>

Added musl-x32 elf header into dictionary.

Signed-off-by sweeaun <[email protected]>
---
 meta/classes/insane.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/classes/insane.bbclass +4 -1
index 0e974b5..259d820 100644
@@ -147,6 +147,9 @@ def package_qa_get_machine_dict(d):
             "linux-gnux32" :       {
                         "x86_64":     (62,     0,    0,          True,          32),
                       },
+            "linux-muslx32" :       {
+                        "x86_64":     (62,     0,    0,          True,          32),
+                      },
             "linux-gnun32" :       {
                         "mips64":       ( 8,     0,    0,          False,         32),
                         "mips64el":     ( 8,     0,    0,          True,          32),

@@ -485,7 +488,7 @@ def package_qa_check_arch(path,name,d, elf, messages):
 
     # Check the architecture and endiannes of the binary
     is_32 = (("virtual/kernel" in provides) or bb.data.inherits_class("module", d)) and \
-            (target_os == "linux-gnux32" or re.match('mips64.*32', d.getVar('DEFAULTTUNE')))
+            (target_os == "linux-gnux32" or target_os == "linux-muslx32"  or re.match('mips64.*32', d.getVar('DEFAULTTUNE')))
     if not ((machine == elf.machine()) or is_32):
         package_qa_add_message(messages, "arch", "Architecture did not match (%s, expected %s) on %s" % \
                  (oe.qa.elf_machine_to_string(elf.machine()), oe.qa.elf_machine_to_string(machine), package_qa_clean_path(path,d)))
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 2/7 siteinfo.bbclass: Support musl-x32

In reply to [email protected]

From: sweeaun <[email protected]>

Modified targetinfo and osinfo to support musl-x32.

Signed-off-by sweeaun <[email protected]>
---
 meta/classes/siteinfo.bbclass | 2 ++
 1 file changed, 2 insertions(+)
meta/classes/siteinfo.bbclass +2 -0
index 90ea5ba..20b4704 100644
@@ -63,6 +63,7 @@ def siteinfo_data(d):
         "linux-gnueabi": "common-linux common-glibc",
         "linux-gnuspe": "common-linux common-glibc",
         "linux-musl": "common-linux common-musl",
+        "linux-muslx32": "common-linux common-musl",
         "linux-musleabi": "common-linux common-musl",
         "linux-muslspe": "common-linux common-musl",
         "uclinux-uclibc": "common-uclibc",

@@ -99,6 +100,7 @@ def siteinfo_data(d):
         "x86_64-darwin9": "bit-64",
         "x86_64-linux": "bit-64",
         "x86_64-linux-musl": "x86_64-linux bit-64",
+        "x86_64-linux-muslx32": "bit-32 ix86-common x32-linux",
         "x86_64-elf": "bit-64",
         "x86_64-linux-gnu": "bit-64 x86_64-linux",
         "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux",
Signature · 1 line
2.7.4
author
#3 lore raw

PATCH 3/7 gnu-efi: Support musl-x32 build

In reply to [email protected]

From: sweeaun <[email protected]>

To build 64-bit binaries for musl-x32.

Signed-off-by sweeaun <[email protected]>
---
 meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb +1 -0
index d6f9f53..7346737 100644
@@ -53,6 +53,7 @@ FILES_${PN} += "${libdir}/*.lds"
 
 # 64-bit binaries are expected for EFI when targeting X32
 INSANE_SKIP_${PN}-dev_append_linux-gnux32 = " arch"
+INSANE_SKIP_${PN}-dev_append_linux-muslx32 = " arch"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.7.4
author
#4 lore raw

PATCH 4/7 grub-efi: Support musl-x32

In reply to [email protected]

From: sweeaun <[email protected]>

To build 64-bit binaries for musl-x32.

Signed-off-by sweeaun <[email protected]>
---
 meta/recipes-bsp/grub/grub-efi_2.02.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-bsp/grub/grub-efi_2.02.bb +2 -0
index 9d494d5..b949beb 100644
@@ -65,5 +65,7 @@ FILES_${PN} += "${libdir}/grub/${GRUB_TARGET}-efi \
 # 64-bit binaries are expected for the bootloader with an x32 userland
 INSANE_SKIP_${PN}_append_linux-gnux32 = " arch"
 INSANE_SKIP_${PN}-dbg_append_linux-gnux32 = " arch"
+INSANE_SKIP_${PN}_append_linux-muslx32 = " arch"
+INSANE_SKIP_${PN}-dbg_append_linux-muslx32 = " arch"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.7.4
author
#5 lore raw

PATCH 5/7 openssl: Support musl-x32 build

In reply to [email protected]

From: sweeaun <[email protected]>

Support musl-x32 build which to build openssl with 32 bits.

Signed-off-by sweeaun <[email protected]>
---
 meta/recipes-connectivity/openssl/openssl.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-connectivity/openssl/openssl.inc +4 -2
index 3980ec2..bcbbe06 100644
@@ -65,8 +65,7 @@ do_configure () {
 	os=${HOST_OS}
 	case $os in
 	linux-gnueabi |\
-	linux-gnuspe |\
-	linux-musl*)
+	linux-gnuspe)
 		os=linux
 		;;
 		*)

@@ -101,6 +100,9 @@ do_configure () {
 	linux-gnux32-x86_64)
 		target=linux-x32
 		;;
+        linux-muslx32-x86_64)
+                target=linux-x32
+                ;;
 	linux-gnu64-x86_64)
 		target=linux-x86_64
 		;;
Signature · 1 line
2.7.4
#6 lore raw

Re: [PATCH 5/7] openssl: Support musl-x32 build

Quoted 14 lines · On 7/5/17 4:56 PM, [email protected] wrote:

From: sweeaun <[email protected]>

Support musl-x32 build which to build openssl with 32 bits.

Signed-off-by sweeaun <[email protected]>
---
 meta/recipes-connectivity/openssl/openssl.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-connectivity/openssl/openssl.inc +0 -0
index 3980ec2..bcbbe06 100644

meta/recipes-connectivity/openssl/openssl.inc do_configure () { · line 69

Quoted 5 lines
meta/recipes-connectivity/openssl/openssl.inc +0 -2
@@ -65,8 +65,7 @@ do_configure () {
 	os=${HOST_OS}
 	case $os in
 	linux-gnueabi |\
-	linux-gnuspe |\
-	linux-musl*)

removing this will break other musl arches.

meta/recipes-connectivity/openssl/openssl.inc do_configure () { · line 105

Quoted 11 lines
meta/recipes-connectivity/openssl/openssl.inc +4 -0
+	linux-gnuspe)
 		os=linux
 		;;
 		*)

@@ -101,6 +100,9 @@ do_configure () {
 	linux-gnux32-x86_64)
 		target=linux-x32
 		;;
+        linux-muslx32-x86_64)
+                target=linux-x32
+                ;;

you can move it above the generic check above

Quoted 4 lines
meta/recipes-connectivity/openssl/openssl.inc +0 -0
 	linux-gnu64-x86_64)
 		target=linux-x86_64
 		;;
author
#7 lore raw

Re: [PATCH 5/7] openssl: Support musl-x32 build

You are right, the linux-musl* removing is breaking other musl arches. I will change to this.

@@ -65,8 +65,7 @@ do_configure () {
os=${HOST_OS}
case $os in

 	linux-gnueabi |\
	linux-gnuspe |\

- linux-musl*)
+ linux-musleabi |\
+ linux-muslspe)
os=linux
;;
*)

I will combine the linux-gnux32-x86_64 and linux-muslx32-x86_64.

@@ -101,6 +100,9 @@ do_configure () {
- linux-gnux32-x86_64
+ linux-gnux32-x86_64| linux-muslx32-x86_64)
target=linux-x32

 		;;
	linux-gnu64-x86_64)

target=linux-x86_64
;;

Signature · 1 line
2.7.4

-----Original Message-----
From: Khem Raj [mailto:[email protected]]
Sent: Thursday, July 6, 2017 3:24 PM
To: Khor, Swee Aun <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH 5/7] openssl: Support musl-x32 build

Quoted 14 lines · On 7/5/17 4:56 PM, [email protected] wrote:

From: sweeaun <[email protected]>

Support musl-x32 build which to build openssl with 32 bits.

Signed-off-by sweeaun <[email protected]>
---
 meta/recipes-connectivity/openssl/openssl.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-connectivity/openssl/openssl.inc +0 -0
index 3980ec2..bcbbe06 100644

meta/recipes-connectivity/openssl/openssl.inc do_configure () { · line 69

Quoted 5 lines
meta/recipes-connectivity/openssl/openssl.inc +0 -2
@@ -65,8 +65,7 @@ do_configure () {
 	os=${HOST_OS}
 	case $os in
 	linux-gnueabi |\
-	linux-gnuspe |\
-	linux-musl*)

removing this will break other musl arches.

meta/recipes-connectivity/openssl/openssl.inc do_configure () { · line 105

Quoted 11 lines
meta/recipes-connectivity/openssl/openssl.inc +4 -0
+	linux-gnuspe)
 		os=linux
 		;;
 		*)

@@ -101,6 +100,9 @@ do_configure () {
 	linux-gnux32-x86_64)
 		target=linux-x32
 		;;
+        linux-muslx32-x86_64)
+                target=linux-x32
+                ;;

you can move it above the generic check above

Quoted 4 lines
meta/recipes-connectivity/openssl/openssl.inc +0 -0
 	linux-gnu64-x86_64)
 		target=linux-x86_64
 		;;
author
#8 lore raw

PATCH 6/7 perl: Support musl-x32 build

In reply to [email protected]

From: sweeaun <[email protected]>

Existing musl fixups in perl recipe doesn't cover linux-muslx32. This is fixed to support musl-x32 build.

Signed-off-by sweeaun <[email protected]>
---
 meta/recipes-devtools/perl/perl_5.24.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/perl/perl_5.24.1.bb +1 -1
index b0ceb84..95d9694 100644
@@ -125,7 +125,7 @@ do_configure() {
         done
 
         # Fixups for musl
-        if [ "${TARGET_OS}" = "linux-musl" -o "${TARGET_OS}" = "linux-musleabi" ]; then
+        if [ "${TARGET_OS}" = "linux-musl" -o "${TARGET_OS}" = "linux-musleabi" -o "${TARGET_OS}" = "linux-muslx32" ]; then
                 sed -i -e "s,\(d_libm_lib_version=\)'define',\1'undef',g" \
                        -e "s,\(d_stdio_ptr_lval=\)'define',\1'undef',g" \
                        -e "s,\(d_stdio_ptr_lval_sets_cnt=\)'define',\1'undef',g" \
Signature · 1 line
2.7.4
author
#9 lore raw

PATCH 7/7 libffi: Support musl-x32 build

In reply to [email protected]

From: sweeaun <[email protected]>

Upstream-Status: Pending.
Added target musl-x32 in configure.ac to support musl-x32 build in libffi.

Signed-off-by sweeaun <[email protected]>
---
 .../0001-libffi-Support-musl-x32-build.patch       | 29 ++++++++++++++++++++++
 meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch new file +29 -0
new file mode 100644
index 0000000..971a543
@@ -0,0 +1,29 @@
+From 62ac8214b3e8b368bd9365a6920b081aa0125671 Mon Sep 17 00:00:00 2001
+From: sweeaun <[email protected]>
+Date: Mon, 3 Jul 2017 13:23:31 -0700
+Subject: [PATCH] libffi: Support musl x32 build
+
+Support libffi build with target musl-x32.
+
+Signed-off-by: sweeaun <[email protected]>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index a7bf5ee..f4e101d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -180,6 +180,9 @@ case "$host" in
+ 	    *-gnux32)
+ 	      TARGET=X86_64
+ 	      ;;
++            *-muslx32)
++              TARGET=X86_64
++              ;;
+ 	    *)
+ 	      TARGET=X86
+ 	      ;;
+-- 
+2.7.4
+
meta/recipes-support/libffi/libffi_3.2.1.bb +1 -0
index 43eee8e..2a3f4b7 100644
@@ -13,6 +13,7 @@ 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://0001-mips-fix-MIPS-softfloat-build-issue.patch \
+           file://0001-libffi-Support-musl-x32-build.patch \
 	   "
 
 SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
Signature · 1 line
2.7.4
#10 lore raw

Re: [PATCH 7/7] libffi: Support musl-x32 build

Quoted 31 lines · On 7/5/17 4:56 PM, [email protected] wrote:

From: sweeaun <[email protected]>

Upstream-Status: Pending.
Added target musl-x32 in configure.ac to support musl-x32 build in libffi.

Signed-off-by sweeaun <[email protected]>
---
 .../0001-libffi-Support-musl-x32-build.patch       | 29 ++++++++++++++++++++++
 meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644 meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch new file +13 -0
new file mode 100644
index 0000000..971a543
@@ -0,0 +1,29 @@
+From 62ac8214b3e8b368bd9365a6920b081aa0125671 Mon Sep 17 00:00:00 2001
+From: sweeaun <[email protected]>
+Date: Mon, 3 Jul 2017 13:23:31 -0700
+Subject: [PATCH] libffi: Support musl x32 build
+
+Support libffi build with target musl-x32.
+
+Signed-off-by: sweeaun <[email protected]>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac

meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch line 23

Quoted 10 lines
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch new file +10 -0
+index a7bf5ee..f4e101d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -180,6 +180,9 @@ case "$host" in
+ 	    *-gnux32)
+ 	      TARGET=X86_64
+ 	      ;;
++            *-muslx32)
++              TARGET=X86_64
++              ;;

just OR it with case just above it.
*-gnux32 | *-muslx32

Quoted 19 lines
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch new file +6 -0
+ 	    *)
+ 	      TARGET=X86
+ 	      ;;
+-- 
+2.7.4
+
meta/recipes-support/libffi/libffi_3.2.1.bb +1 -0
index 43eee8e..2a3f4b7 100644
@@ -13,6 +13,7 @@ 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://0001-mips-fix-MIPS-softfloat-build-issue.patch \
+           file://0001-libffi-Support-musl-x32-build.patch \
 	   "
 
 SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
author
#11 lore raw

Re: [PATCH 7/7] libffi: Support musl-x32 build

Will do that.

-----Original Message-----
From: Khem Raj [mailto:[email protected]]
Sent: Thursday, July 6, 2017 3:22 PM
To: Khor, Swee Aun <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH 7/7] libffi: Support musl-x32 build

Quoted 39 lines · On 7/5/17 4:56 PM, [email protected] wrote:

From: sweeaun <[email protected]>

Upstream-Status: Pending.
Added target musl-x32 in configure.ac to support musl-x32 build in libffi.

Signed-off-by sweeaun <[email protected]>
---
 .../0001-libffi-Support-musl-x32-build.patch       | 29 ++++++++++++++++++++++
 meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +
 2 files changed, 30 insertions(+)
 create mode 100644

meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build. patch

(quoted diff) +0 -0

a/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-buil d.patch b/meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-buil d.patch
new file mode 100644
index 0000000..971a543

meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32- new file +15 -0
+++ build.patch

@@ -0,0 +1,29 @@
+From 62ac8214b3e8b368bd9365a6920b081aa0125671 Mon Sep 17 00:00:00 
+2001
+From: sweeaun <[email protected]>
+Date: Mon, 3 Jul 2017 13:23:31 -0700
+Subject: [PATCH] libffi: Support musl x32 build
+
+Support libffi build with target musl-x32.
+
+Signed-off-by: sweeaun <[email protected]>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac index a7bf5ee..f4e101d

meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32- line 24

Quoted 10 lines
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32- new file +10 -0
+100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -180,6 +180,9 @@ case "$host" in
+ 	    *-gnux32)
+ 	      TARGET=X86_64
+ 	      ;;
++            *-muslx32)
++              TARGET=X86_64
++              ;;

just OR it with case just above it.
*-gnux32 | *-muslx32

Quoted 20 lines
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32- new file +6 -0
+ 	    *)
+ 	      TARGET=X86
+ 	      ;;
+--
+2.7.4
+
meta/recipes-support/libffi/libffi_3.2.1.bb +1 -0
index 43eee8e..2a3f4b7 100644
@@ -13,6 +13,7 @@ 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://0001-mips-fix-MIPS-softfloat-build-issue.patch \
+           file://0001-libffi-Support-musl-x32-build.patch \
 	   "
 
 SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
#12 lore raw

Re: [PATCH 7/7] libffi: Support musl-x32 build

In reply to [email protected]
Quoted 3 lines · On Wed, 2017-07-05 at 16:56 -0700, [email protected] wrote:

From: sweeaun <[email protected]>

Upstream-Status: Pending.

The Upstream-Status needs to be in the .patch file, not in the main patch commit.

See below

Quoted 23 lines

Added target musl-x32 in configure.ac to support musl-x32 build in libffi.

Signed-off-by sweeaun <[email protected]>

---
 .../0001-libffi-Support-musl-x32-build.patch       | 29
++++++++++++++++++++++
 meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +

 2 files changed, 30 insertions(+)

 create mode 100644 meta/recipes-support/libffi/libffi/0001-libffi- Support-musl-x32-build.patch

(quoted diff) +0 -0

musl-x32-build.patch b/meta/recipes-support/libffi/libffi/0001- libffi-Support-musl-x32-build.patch
new file mode 100644
index 0000000..971a543

meta/recipes-support/libffi/libffi/0001-libffi-Support-musl- new file +0 -0

x32-build.patch

meta/recipes-support/libffi/libffi/0001-libffi-Support-musl- new file +1 -0
@@ -0,0 +1,29 @@
+From 62ac8214b3e8b368bd9365a6920b081aa0125671 Mon Sep 17 00:00:00

2001

meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-

Quoted 6 lines
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl- new file +6 -0
+From: sweeaun <[email protected]>
+Date: Mon, 3 Jul 2017 13:23:31 -0700
+Subject: [PATCH] libffi: Support musl x32 build
+
+Support libffi build with target musl-x32.
+

Upstream-Status goes here

Sau!

Quoted 40 lines
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl- new file +22 -0
+Signed-off-by: sweeaun <[email protected]>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index a7bf5ee..f4e101d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -180,6 +180,9 @@ case "$host" in
+ 	    *-gnux32)
+ 	      TARGET=X86_64
+ 	      ;;
++            *-muslx32)
++              TARGET=X86_64
++              ;;
+ 	    *)
+ 	      TARGET=X86
+ 	      ;;
+-- 
+2.7.4
+
meta/recipes-support/libffi/libffi_3.2.1.bb +0 -0
index 43eee8e..2a3f4b7 100644
@@ -13,6 +13,7 @@ SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.ta
 r.gz \
             file://not-win32.patch \

     file://0001-mips-Use-compiler-internal-define-for- linux.patch \
            file://0001-mips-fix-MIPS-softfloat-build-issue.patch \
+           file://0001-libffi-Support-musl-x32-build.patch \
     "

 SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
--
2.7.4

author
#13 lore raw

Re: [PATCH 7/7] libffi: Support musl-x32 build

Got it. Will update that.

-----Original Message-----
From: Wold, Saul
Sent: Thursday, July 6, 2017 10:51 PM
To: Khor, Swee Aun <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH 7/7] libffi: Support musl-x32 build

Quoted 3 lines · On Wed, 2017-07-05 at 16:56 -0700, [email protected] wrote:

From: sweeaun <[email protected]>

Upstream-Status: Pending.

The Upstream-Status needs to be in the .patch file, not in the main patch commit.

See below

Quoted 23 lines

Added target musl-x32 in configure.ac to support musl-x32 build in libffi.

Signed-off-by sweeaun <[email protected]>

---
 .../0001-libffi-Support-musl-x32-build.patch       | 29
++++++++++++++++++++++
 meta/recipes-support/libffi/libffi_3.2.1.bb        |  1 +

 2 files changed, 30 insertions(+)

 create mode 100644 meta/recipes-support/libffi/libffi/0001-libffi- Support-musl-x32-build.patch

(quoted diff) +0 -0

musl-x32-build.patch b/meta/recipes-support/libffi/libffi/0001- libffi-Support-musl-x32-build.patch
new file mode 100644
index 0000000..971a543

meta/recipes-support/libffi/libffi/0001-libffi-Support-musl- new file +0 -0

x32-build.patch

meta/recipes-support/libffi/libffi/0001-libffi-Support-musl- new file +1 -0
@@ -0,0 +1,29 @@
+From 62ac8214b3e8b368bd9365a6920b081aa0125671 Mon Sep 17 00:00:00

2001

meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-

Quoted 6 lines
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl- new file +6 -0
+From: sweeaun <[email protected]>
+Date: Mon, 3 Jul 2017 13:23:31 -0700
+Subject: [PATCH] libffi: Support musl x32 build
+
+Support libffi build with target musl-x32.
+

Upstream-Status goes here

Sau!

Quoted 40 lines
meta/recipes-support/libffi/libffi/0001-libffi-Support-musl- new file +22 -0
+Signed-off-by: sweeaun <[email protected]>
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac index a7bf5ee..f4e101d 
+100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -180,6 +180,9 @@ case "$host" in
+ 	    *-gnux32)
+ 	      TARGET=X86_64
+ 	      ;;
++            *-muslx32)
++              TARGET=X86_64
++              ;;
+ 	    *)
+ 	      TARGET=X86
+ 	      ;;
+--
+2.7.4
+
meta/recipes-support/libffi/libffi_3.2.1.bb +0 -0
index 43eee8e..2a3f4b7 100644
@@ -13,6 +13,7 @@ SRC_URI = "ftp://sourceware.org/pub/libffi/${BP}.ta
 r.gz \
             file://not-win32.patch \

     file://0001-mips-Use-compiler-internal-define-for- linux.patch \
            file://0001-mips-fix-MIPS-softfloat-build-issue.patch \
+           file://0001-libffi-Support-musl-x32-build.patch \
     "

 SRC_URI[md5sum] = "83b89587607e3eb65c70d361f13bab43"
--
2.7.4

#14 lore raw

✗ patchtest: failure for Support combination of MUSL and x32 build

In reply to [email protected]

== Series Details ==

Series: Support combination of MUSL and x32 build
Revision: 1
URL : https://patchwork.openembedded.org/series/7591/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Added patch file is missing Upstream-Status in the header [test_upstream_status_presence]
Suggested fix Add Upstream-Status: <status> to the header of meta/recipes-support/libffi/libffi/0001-libffi-Support-musl-x32-build.patch (possible values: Pending, Submitted, Accepted, Backport, Denied, Inappropriate)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe