Skip to contentSkip to conversation

gcc-runtime: fix C++ header mapping for n32/x32 tune

PATCH In review [email protected] 4 participants 16 messages Jan 30, 2019 – Jun 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gcc-runtime: fix C++ header mapping for n32/x32 tune

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations:

multilib configuration:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

ignoring nonexistent directory "<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32

---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +4 -4
index 50ecc81..e0f5c80 100644
@@ -98,16 +98,16 @@ do_install_append_class-target () {
 
 	if [ "${TARGET_OS}" = "linux-gnun32" ]; then
 		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
 		else
 			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 		fi
 	fi
 	if [ "${TARGET_OS}" = "linux-gnux32" ]; then
 		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
 		else
 			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 		fi
Signature · 1 line
2.7.4
#1 lore raw

Please ignore this patch. I accidentally sent it 3 times.

Quoted 47 lines · On 1/30/19 4:02 PM, [email protected] wrote:

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations:

multilib configuration:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

ignoring nonexistent directory "<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32

---
  meta/recipes-devtools/gcc/gcc-runtime.inc | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +4 -4
index 50ecc81..e0f5c80 100644
@@ -98,16 +98,16 @@ do_install_append_class-target () {
 
  	if [ "${TARGET_OS}" = "linux-gnun32" ]; then
  		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
  		else
  			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
  		fi
  	fi
  	if [ "${TARGET_OS}" = "linux-gnux32" ]; then
  		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
  		else
  			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
  		fi
Signature · 3 lines
BRs

Sandy(Li Changqing)
#2 lore raw
In reply to [email protected]
Quoted 16 lines · On Wed, Jan 30, 2019 at 12:03 AM <[email protected]> wrote:

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations:

multilib configuration:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

Quoted 2 lines

ignoring nonexistent directory "<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32

seems fine to me.

Quoted 38 lines
---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +4 -5
index 50ecc81..e0f5c80 100644
@@ -98,16 +98,16 @@ do_install_append_class-target () {
 
        if [ "${TARGET_OS}" = "linux-gnun32" ]; then
                if [ "${MULTILIBS}" != "" ]; then
-                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
-                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
                else
                        ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
                fi
        fi
        if [ "${TARGET_OS}" = "linux-gnux32" ]; then
                if [ "${MULTILIBS}" != "" ]; then
-                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux
-                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
                else
                        ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
                fi
--

2.7.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#3 lore raw
In reply to [email protected]
Quoted 18 lines · On Wed, 2019-01-30 at 16:02 +0800, [email protected] wrote:

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since
it's
using a generic compiler, not one specifically targeting the
multilib
vendor prefix and default tune. This adds the right mapping to
ensure
SDKs work as expected. And fix problem in below configurations:

multilib configuration:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

Quoted 7 lines

ignoring nonexistent directory "<path>/sysroots/mips64-poky-
linux/usr/include/c++/8.2.0/mips64-poky-linux/32

---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Breaks in testing sadly:

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

Cheers,

Richard

#4 lore raw

PATCH v2 1/1 gcc-runtime: fix C++ header mapping for n32/x32 tune

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations:

multilib configuration 1:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

ignoring nonexistent directory "<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32

multilib configuration 2:
MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32' DEFAULTTUNE = 'mips64-n32' DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64' DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2' require conf/multilib.conf

For this configuration:
for target gcc-runtime, need to create symlink like mips64-poly-linux --> mips64-poky-linux-gnu32 for target lib64-gcc-runtime, need to create symlink like mips64-poly-linux/32 --> mips64-pokymllib64-linux in order to avoid conflict during populate_sdk, create symlink for subfoler bits/ext for target gcc-runtime, this is ugly, but seems no better way to cover all kinds of configuration.

single lib configuration:
MACHINE="qemumips64"
DEFAULTTUNE = "mips64-n32"

---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +17 -12
index 50ecc81..f92becc 100644
@@ -85,10 +85,6 @@ do_install () {
 	if [ -d ${D}${infodir} ]; then
 		rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
 	fi
-	if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
-		ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
-	fi
-
 }
 
 do_install_append_class-target () {
@@ -97,20 +93,29 @@ do_install_append_class-target () {
 	fi
 
 	if [ "${TARGET_OS}" = "linux-gnun32" ]; then
-		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
+		if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
+		elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
 		else
 			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 		fi
-	fi
-	if [ "${TARGET_OS}" = "linux-gnux32" ]; then
-		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32
+	elif [ "${TARGET_OS}" = "linux-gnux32" ]; then
+		if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
+		elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
 		else
 			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 		fi
+	elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+		mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+		ln -s ../${TARGET_SYS}/bits ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits
+		ln -s ../${TARGET_SYS}/ext ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
 	fi
 
 	if [ "${TCLIBC}" != "glibc" ]; then
Signature · 1 line
2.7.4
#5 lore raw
Quoted 43 lines · On Tue, 2019-02-12 at 13:10 +0800, [email protected] wrote:

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since
it's
using a generic compiler, not one specifically targeting the
multilib
vendor prefix and default tune. This adds the right mapping to
ensure
SDKs work as expected. And fix problem in below configurations:

multilib configuration 1:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

ignoring nonexistent directory "<path>/sysroots/mips64-poky-
linux/usr/include/c++/8.2.0/mips64-poky-linux/32

multilib configuration 2:
MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32' DEFAULTTUNE = 'mips64-n32' DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64' DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2' require conf/multilib.conf

For this configuration:
for target gcc-runtime, need to create symlink like mips64-poly-
linux --> mips64-poky-linux-gnu32
for target lib64-gcc-runtime, need to create symlink like mips64-
poly-linux/32 --> mips64-pokymllib64-linux
in order to avoid conflict during populate_sdk, create symlink
for subfoler bits/ext for target gcc-runtime,
this is ugly, but seems no better way to cover all kinds of
configuration.

single lib configuration:
MACHINE="qemumips64"
DEFAULTTUNE = "mips64-n32"

Quoted 5 lines
---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 29 +++++++++++++++++--
----------
 1 file changed, 17 insertions(+), 12 deletions(-)

I haven't looked into why and it took a bit of narrowing down to find the commit responsible but this is still causing a failure on the autobuilder:

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

Cheers,

Richard

#6 lore raw
Quoted 49 lines · Richard Purdie
Quoted 43 lines · On Tue, 2019-02-12 at 13:10 +0800, [email protected] wrote:

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since
it's
using a generic compiler, not one specifically targeting the
multilib
vendor prefix and default tune. This adds the right mapping to
ensure
SDKs work as expected. And fix problem in below configurations:

multilib configuration 1:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

ignoring nonexistent directory "<path>/sysroots/mips64-poky-
linux/usr/include/c++/8.2.0/mips64-poky-linux/32

multilib configuration 2:
MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32' DEFAULTTUNE = 'mips64-n32' DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64' DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2' require conf/multilib.conf

For this configuration:
for target gcc-runtime, need to create symlink like mips64-poly-
linux --> mips64-poky-linux-gnu32
for target lib64-gcc-runtime, need to create symlink like mips64-
poly-linux/32 --> mips64-pokymllib64-linux
in order to avoid conflict during populate_sdk, create symlink
for subfoler bits/ext for target gcc-runtime,
this is ugly, but seems no better way to cover all kinds of
configuration.

single lib configuration:
MACHINE="qemumips64"
DEFAULTTUNE = "mips64-n32"

Quoted 5 lines
---
  meta/recipes-devtools/gcc/gcc-runtime.inc | 29 +++++++++++++++++--
----------
  1 file changed, 17 insertions(+), 12 deletions(-)
Quoted 5 lines

I haven't looked into why and it took a bit of narrowing down to find the commit responsible but this is still causing a failure on the autobuilder:

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

Hi, Richard

I checked this problem,  this autobuilder fail seems not related to this patch.

it is failed as:

Error:
Problem: conflicting requests
- nothing provides lib64-lttng-modules needed by lib64-packagegroup-core-tools-profile-1.0-r3.0.qemux86'

but one place weird is I cannot reproduce this error locally with same configuration.

This is my lib64-packagegroup-core-tools-profile.spec:

Requires: lib64-powertop
Requires: lib64-systemtap
Requires: lib64-valgrind
Requires: lttng-modules
Recommends: lib64-blktrace

Requires should be lttng-modules  and not lib64-lttng-modules. lib64-lttng-modules should have been replace to lttng-modules.

during do_package_rpm->mapping_rename_hook->get_package_mapping.

I checked history of this part of code,  it should not have change recently,  so my local code should same as autobuildler, so I don't

quite understand why autobuilder failed.

If possible, could you help to check on the build server of the autobuilder ? Thanks.

Quoted 6 lines

Cheers,

Richard

Signature · 3 lines
BRs

Sandy(Li Changqing)
#7 lore raw
Quoted 85 lines · Changqing Li
Quoted 49 lines · Richard Purdie
Quoted 43 lines · On Tue, 2019-02-12 at 13:10 +0800,[email protected] wrote:

From: Changqing Li<[email protected]>

The SDK was unable to find the C++ header pieces correctly since
it's
using a generic compiler, not one specifically targeting the
multilib
vendor prefix and default tune. This adds the right mapping to
ensure
SDKs work as expected. And fix problem in below configurations:

multilib configuration 1:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

ignoring nonexistent directory "<path>/sysroots/mips64-poky-
linux/usr/include/c++/8.2.0/mips64-poky-linux/32

multilib configuration 2:
MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32' DEFAULTTUNE = 'mips64-n32' DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64' DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2' require conf/multilib.conf

For this configuration:
for target gcc-runtime, need to create symlink like mips64-poly-
linux --> mips64-poky-linux-gnu32
for target lib64-gcc-runtime, need to create symlink like mips64-
poly-linux/32 --> mips64-pokymllib64-linux
in order to avoid conflict during populate_sdk, create symlink
for subfoler bits/ext for target gcc-runtime,
this is ugly, but seems no better way to cover all kinds of
configuration.

single lib configuration:
MACHINE="qemumips64"
DEFAULTTUNE = "mips64-n32"

Quoted 5 lines
---
  meta/recipes-devtools/gcc/gcc-runtime.inc | 29 +++++++++++++++++--
----------
  1 file changed, 17 insertions(+), 12 deletions(-)
Quoted 5 lines

I haven't looked into why and it took a bit of narrowing down to find the commit responsible but this is still causing a failure on the autobuilder:

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

Hi, Richard

I checked this problem,  this autobuilder fail seems not related to this patch.

it is failed as:

Error:
Problem: conflicting requests
- nothing provides lib64-lttng-modules needed by lib64-packagegroup-core-tools-profile-1.0-r3.0.qemux86'

but one place weird is I cannot reproduce this error locally with same configuration.

This is my lib64-packagegroup-core-tools-profile.spec:

Requires: lib64-powertop
Requires: lib64-systemtap
Requires: lib64-valgrind
Requires: lttng-modules
Recommends: lib64-blktrace

Requires should be lttng-modules  and not lib64-lttng-modules. lib64-lttng-modules should have been replace to lttng-modules.

during do_package_rpm->mapping_rename_hook->get_package_mapping.

Quoted 7 lines

I checked history of this part of code,  it should not have change recently,  so my local code should same as autobuildler, so I don't

quite understand why autobuilder failed.

If possible, could you help to check on the build server of the autobuilder ? Thanks.

Hi, Richard

I  tested the scenario of the failed build with this patch and the latest poky distro.  It can build success.  Also,  the fauilure seems not

related to this patch.

Could you try again build this patch on autobuilder?  Thanks

Quoted 10 lines
Quoted 5 lines

Cheers,

Richard

Signature · 3 lines
BRs

Sandy(Li Changqing)
Signature · 3 lines
BRs

Sandy(Li Changqing)
#8 lore raw

PATCH v3 1/1 gcc-runtime: fix C++ header mapping for n32/x32 tune

In reply to Richard Purdie

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations:

multilib configuration 1:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

ignoring nonexistent directory "<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32

multilib configuration 2:
MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32'
DEFAULTTUNE = 'mips64-n32'
DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64'
DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2'
require conf/multilib.conf

For this configuration:
for target gcc-runtime, need to create symlink like mips64-poly-linux --> mips64-poky-linux-gnu32 for target lib64-gcc-runtime, need to create symlink like mips64-poly-linux/32 --> mips64-pokymllib64-linux in order to avoid conflict during populate_sdk, create symlink for subfoler bits/ext for target gcc-runtime, this is ugly, but seems no better way to cover all kinds of configuration.

single lib configuration:
MACHINE="qemumips64"
DEFAULTTUNE = "mips64-n32"

---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +17 -12
index 3d03d8e..ba767e1 100644
@@ -86,10 +86,6 @@ do_install () {
 	if [ -d ${D}${infodir} ]; then
 		rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
 	fi
-	if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
-		ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
-	fi
-
 }
 
 do_install_append_class-target () {
@@ -98,20 +94,29 @@ do_install_append_class-target () {
 	fi
 
 	if [ "${TARGET_OS}" = "linux-gnun32" ]; then
-		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
+		if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
+		elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
 		else
 			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 		fi
-	fi
-	if [ "${TARGET_OS}" = "linux-gnux32" ]; then
-		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32
+	elif [ "${TARGET_OS}" = "linux-gnux32" ]; then
+		if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
+		elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
 		else
 			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 		fi
+	elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+		mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+		ln -s ../${TARGET_SYS}/bits ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits
+		ln -s ../${TARGET_SYS}/ext ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
 	fi
 
 	if [ "${TCLIBC}" != "glibc" ]; then
Signature · 1 line
2.7.4
#9 lore raw
Quoted 16 lines · On Tue, Jun 18, 2019 at 12:47 AM <[email protected]> wrote:

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations:

multilib configuration 1:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

Quoted 5 lines

ignoring nonexistent directory "<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32

multilib configuration 2:
MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32'

machine is already 64bit so default lib config will be 64bit, what is multilib:lib64 for here ?

Quoted 81 lines

DEFAULTTUNE = 'mips64-n32'
DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64'
DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2'
require conf/multilib.conf

For this configuration:
for target gcc-runtime, need to create symlink like mips64-poly-linux --> mips64-poky-linux-gnu32 for target lib64-gcc-runtime, need to create symlink like mips64-poly-linux/32 --> mips64-pokymllib64-linux in order to avoid conflict during populate_sdk, create symlink for subfoler bits/ext for target gcc-runtime, this is ugly, but seems no better way to cover all kinds of configuration.

single lib configuration:
MACHINE="qemumips64"
DEFAULTTUNE = "mips64-n32"

---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +17 -13
index 3d03d8e..ba767e1 100644
@@ -86,10 +86,6 @@ do_install () {
        if [ -d ${D}${infodir} ]; then
                rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
        fi
-       if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
-               ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
-       fi
-
 }
 
 do_install_append_class-target () {
@@ -98,20 +94,29 @@ do_install_append_class-target () {
        fi
 
        if [ "${TARGET_OS}" = "linux-gnun32" ]; then
-               if [ "${MULTILIBS}" != "" ]; then
-                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
-                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
+               if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
+               elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
                else
                        ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
                fi
-       fi
-       if [ "${TARGET_OS}" = "linux-gnux32" ]; then
-               if [ "${MULTILIBS}" != "" ]; then
-                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux
-                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32
+       elif [ "${TARGET_OS}" = "linux-gnux32" ]; then
+               if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
+               elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
                else
                        ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
                fi
+       elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+               mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+               ln -s ../${TARGET_SYS}/bits ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits
+               ln -s ../${TARGET_SYS}/ext ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
        fi
 
        if [ "${TCLIBC}" != "glibc" ]; then
--

2.7.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#10 lore raw
Quoted 16 lines · Khem Raj
Quoted 15 lines · On Tue, Jun 18, 2019 at 12:47 AM <[email protected]> wrote:

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations:

multilib configuration 1:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

Quoted 7 lines
Quoted 5 lines

ignoring nonexistent directory "<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32

multilib configuration 2:
MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32'

machine is already 64bit so default lib config will be 64bit, what is multilib:lib64 for here ?

This config is get from autobuilder.

machine is set to qemumips64, but DEFAULTTUNE is set to mips64-n32,

so this should be why use multilib:lib64.

Quoted 82 lines
Quoted 82 lines

DEFAULTTUNE = 'mips64-n32'
DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64'
DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2'
require conf/multilib.conf

For this configuration:
for target gcc-runtime, need to create symlink like mips64-poly-linux --> mips64-poky-linux-gnu32 for target lib64-gcc-runtime, need to create symlink like mips64-poly-linux/32 --> mips64-pokymllib64-linux in order to avoid conflict during populate_sdk, create symlink for subfoler bits/ext for target gcc-runtime, this is ugly, but seems no better way to cover all kinds of configuration.

single lib configuration:
MACHINE="qemumips64"
DEFAULTTUNE = "mips64-n32"

---
  meta/recipes-devtools/gcc/gcc-runtime.inc | 29 +++++++++++++++++------------
  1 file changed, 17 insertions(+), 12 deletions(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +17 -13
index 3d03d8e..ba767e1 100644
@@ -86,10 +86,6 @@ do_install () {
         if [ -d ${D}${infodir} ]; then
                 rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
         fi
-       if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
-               ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
-       fi
-
  }
 
  do_install_append_class-target () {
@@ -98,20 +94,29 @@ do_install_append_class-target () {
         fi
 
         if [ "${TARGET_OS}" = "linux-gnun32" ]; then
-               if [ "${MULTILIBS}" != "" ]; then
-                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
-                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
+               if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
+               elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
                 else
                         ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
                 fi
-       fi
-       if [ "${TARGET_OS}" = "linux-gnux32" ]; then
-               if [ "${MULTILIBS}" != "" ]; then
-                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux
-                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32
+       elif [ "${TARGET_OS}" = "linux-gnux32" ]; then
+               if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
+               elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+                       mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+                       ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
                 else
                         ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
                 fi
+       elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+               mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+               ln -s ../${TARGET_SYS}/bits ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits
+               ln -s ../${TARGET_SYS}/ext ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
         fi
 
         if [ "${TCLIBC}" != "glibc" ]; then
--

2.7.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 3 lines
BRs

Sandy(Li Changqing)
#11 lore raw
In reply to [email protected]
Quoted 31 lines · On Tue, Jun 18, 2019 at 03:46:56PM +0800, [email protected] wrote:

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations:

multilib configuration 1:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

ignoring nonexistent directory "<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32

multilib configuration 2:
MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32'
DEFAULTTUNE = 'mips64-n32'
DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64'
DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2'
require conf/multilib.conf

For this configuration:
for target gcc-runtime, need to create symlink like mips64-poly-linux --> mips64-poky-linux-gnu32 for target lib64-gcc-runtime, need to create symlink like mips64-poly-linux/32 --> mips64-pokymllib64-linux in order to avoid conflict during populate_sdk, create symlink for subfoler bits/ext for target gcc-runtime, this is ugly, but seems no better way to cover all kinds of configuration.

Quoted 3 lines

single lib configuration:
MACHINE="qemumips64"
DEFAULTTUNE = "mips64-n32"

This seems to be causing:

ln: failed to create symbolic link 'work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oe-linux-gnueabi/bits': No such file or directory
WARNING: exit code 1 from a shell command.
ERROR: Function failed: do_install (log file is located at work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/temp/log.do_install.31049)

There is only empty directory without the -gnueabi suffix:
work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oe-linux/

and

work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oemllib32-linux-gnueabi/ bits ext

Quoted 66 lines
---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +17 -12
index 3d03d8e..ba767e1 100644
@@ -86,10 +86,6 @@ do_install () {
 	if [ -d ${D}${infodir} ]; then
 		rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
 	fi
-	if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
-		ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
-	fi
-
 }
 
 do_install_append_class-target () {
@@ -98,20 +94,29 @@ do_install_append_class-target () {
 	fi
 
 	if [ "${TARGET_OS}" = "linux-gnun32" ]; then
-		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
+		if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
+		elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
 		else
 			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 		fi
-	fi
-	if [ "${TARGET_OS}" = "linux-gnux32" ]; then
-		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32
+	elif [ "${TARGET_OS}" = "linux-gnux32" ]; then
+		if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
+		elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
 		else
 			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 		fi
+	elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+		mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+		ln -s ../${TARGET_SYS}/bits ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits
+		ln -s ../${TARGET_SYS}/ext ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
 	fi
 
 	if [ "${TCLIBC}" != "glibc" ]; then
Signature · 7 lines
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#12 lore raw

PATCH 1/1 gcc-runtime.inc: create the correct directory before creating the symlinks in it

* since
commit b071a1a209556158bcfcc20e3c8bd4b15373767c
Author: Changqing Li <[email protected]>
Date: Tue Jun 18 15:46:56 2019 +0800

gcc-runtime: fix C++ header mapping for n32/x32 tune

gcc-runtime.do_install is failing with:

ln: failed to create symbolic link 'work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oe-linux-gnueabi/bits': No such file or directory
WARNING: exit code 1 from a shell command.
ERROR: Function failed: do_install (log file is located at work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/temp/log.do_install.31049)

There is only empty directory without the -gnueabi suffix:
work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oe-linux/

and

work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oemllib32-linux-gnueabi/ bits ext

* make sure to create correct directory (with -${TARGET_OS suffix instead of -linux suffix) before creating the symlinks in it

---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -1
index ba767e1a38..a5c2600d7f 100644
@@ -114,7 +114,7 @@ do_install_append_class-target () {
 			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
 		fi
 	elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
-		mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+		mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
 		ln -s ../${TARGET_SYS}/bits ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits
 		ln -s ../${TARGET_SYS}/ext ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
 	fi
Signature · 1 line
2.17.1
#13 lore raw
In reply to Martin Jansa
Quoted 41 lines · Martin Jansa
Quoted 31 lines · On Tue, Jun 18, 2019 at 03:46:56PM +0800, [email protected] wrote:

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations:

multilib configuration 1:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

ignoring nonexistent directory "<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32

multilib configuration 2:
MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32'
DEFAULTTUNE = 'mips64-n32'
DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64'
DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2'
require conf/multilib.conf

For this configuration:
for target gcc-runtime, need to create symlink like mips64-poly-linux --> mips64-poky-linux-gnu32 for target lib64-gcc-runtime, need to create symlink like mips64-poly-linux/32 --> mips64-pokymllib64-linux in order to avoid conflict during populate_sdk, create symlink for subfoler bits/ext for target gcc-runtime, this is ugly, but seems no better way to cover all kinds of configuration.

Quoted 3 lines

single lib configuration:
MACHINE="qemumips64"
DEFAULTTUNE = "mips64-n32"

This seems to be causing:

ln: failed to create symbolic link 'work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oe-linux-gnueabi/bits': No such file or directory
WARNING: exit code 1 from a shell command.
ERROR: Function failed: do_install (log file is located at work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/temp/log.do_install.31049)

Quoted 7 lines

There is only empty directory without the -gnueabi suffix:
work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oe-linux/

and

work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oemllib32-linux-gnueabi/ bits ext

Could you send your configuration like this? Thanks.

MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32'
DEFAULTTUNE = 'mips64-n32'
DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64'
DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2'
require conf/multilib.conf

Quoted 66 lines
Quoted 66 lines
---
  meta/recipes-devtools/gcc/gcc-runtime.inc | 29 +++++++++++++++++------------
  1 file changed, 17 insertions(+), 12 deletions(-)
meta/recipes-devtools/gcc/gcc-runtime.inc +17 -12
index 3d03d8e..ba767e1 100644
@@ -86,10 +86,6 @@ do_install () {
  	if [ -d ${D}${infodir} ]; then
  		rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
  	fi
-	if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
-		ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
-	fi
-
  }
 
  do_install_append_class-target () {
@@ -98,20 +94,29 @@ do_install_append_class-target () {
  	fi
 
  	if [ "${TARGET_OS}" = "linux-gnun32" ]; then
-		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
+		if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
+		elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
  		else
  			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
  		fi
-	fi
-	if [ "${TARGET_OS}" = "linux-gnux32" ]; then
-		if [ "${MULTILIBS}" != "" ]; then
-			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux
-			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32
+	elif [ "${TARGET_OS}" = "linux-gnux32" ]; then
+		if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
+		elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+			mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
+			ln -s ../${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
  		else
  			ln -s ${TARGET_SYS} ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
  		fi
+	elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
+		mkdir ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
+		ln -s ../${TARGET_SYS}/bits ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits
+		ln -s ../${TARGET_SYS}/ext ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
  	fi
 
  	if [ "${TCLIBC}" != "glibc" ]; then
Signature · 7 lines
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Signature · 3 lines
BRs

Sandy(Li Changqing)
#14 lore raw

Hi,

see the fix here:
http://lists.openembedded.org/pipermail/openembedded-core/2019-June/283928.html

I think it doesn't need additional explanation.

Any aarch64/arm multilib configuration should trigger this (or anything where TARGET_OS isn't just "linux").

Regards,

Quoted 168 lines · Changqing Li
Quoted 1 line · Martin Jansa

On Tue, Jun 18, 2019 at 03:46:56PM +0800, [email protected]

Quoted 15 lines · wrote:
Quoted 15 lines

From: Changqing Li <[email protected]>

The SDK was unable to find the C++ header pieces correctly since it's using a generic compiler, not one specifically targeting the multilib vendor prefix and default tune. This adds the right mapping to ensure SDKs work as expected. And fix problem in below configurations:

multilib configuration 1:
MACHINE="qemumips64"
MULTILIBS ?= "multilib:lib32 multilib:libn32" DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips" DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32" MULTILIB_GLOBAL_VARIANTS_append = " libn32" require conf/multilib.conf

Quoted 1 line
Quoted 1 line

ignoring nonexistent directory

"<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32

Quoted 11 lines
Quoted 11 lines

multilib configuration 2:
MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32'
DEFAULTTUNE = 'mips64-n32'
DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64'
DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2'
require conf/multilib.conf

For this configuration:
for target gcc-runtime, need to create symlink like mips64-poly-linux

--> mips64-poky-linux-gnu32

Quoted 1 line
Quoted 1 line

for target lib64-gcc-runtime, need to create symlink like

mips64-poly-linux/32 --> mips64-pokymllib64-linux

Quoted 1 line
Quoted 1 line

in order to avoid conflict during populate_sdk, create symlink for

subfoler bits/ext for target gcc-runtime,

Quoted 1 line
Quoted 1 line

this is ugly, but seems no better way to cover all kinds of

configuration.

Quoted 7 lines
Quoted 4 lines

single lib configuration:
MACHINE="qemumips64"
DEFAULTTUNE = "mips64-n32"

This seems to be causing:

ln: failed to create symbolic link

'work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oe-linux-gnueabi/bits':
No such file or directory

Quoted 2 lines

WARNING: exit code 1 from a shell command.
ERROR: Function failed: do_install (log file is located at

work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/temp/log.do_install.31049)

Quoted 3 lines

There is only empty directory without the -gnueabi suffix:

work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oe-linux/

Quoted 4 lines

and

work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oemllib32-linux-gnueabi/

Quoted 1 line

bits ext

Could you send your configuration like this? Thanks.

MACHINE="qemumips64"
MULTILIBS = 'multilib:lib64 multilib:lib32'
DEFAULTTUNE = 'mips64-n32'
DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64'
DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2'
require conf/multilib.conf

Quoted 3 lines
Quoted 3 lines
---
  meta/recipes-devtools/gcc/gcc-runtime.inc | 29

+++++++++++++++++------------

Quoted 3 lines

Review

Quoted 3 lines
  1 file changed, 17 insertions(+), 12 deletions(-)
(quoted diff) +0 -0

b/meta/recipes-devtools/gcc/gcc-runtime.inc

Quoted 8 lines

meta/recipes-devtools/gcc/gcc-runtime.inc do_install () { · line 89

Quoted 8 lines

index 3d03d8e..ba767e1 100644

meta/recipes-devtools/gcc/gcc-runtime.inc +0 -1
@@ -86,10 +86,6 @@ do_install () {
     if [ -d ${D}${infodir} ]; then
             rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
     fi
-    if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a

"${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install () { · line 90

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +0 -1
-            ln -s ${TARGET_SYS}

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}

Quoted 11 lines

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 102

Quoted 11 lines
meta/recipes-devtools/gcc/gcc-runtime.inc +0 -4
-    fi
-
  }
 
  do_install_append_class-target () {
@@ -98,20 +94,29 @@ do_install_append_class-target () {
     fi
 
     if [ "${TARGET_OS}" = "linux-gnun32" ]; then
-            if [ "${MULTILIBS}" != "" ]; then
-                    mkdir

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 103

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +0 -1
-                    ln -s ../${TARGET_SYS}

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 97

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
+            if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a

"${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 98

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
+                    mkdir

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 99

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
+                    ln -s ../${TARGET_SYS}

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32

Quoted 2 lines

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 101

Quoted 2 lines
meta/recipes-devtools/gcc/gcc-runtime.inc +2 -0
+            elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+                    mkdir

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 102

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
+                    ln -s ../${TARGET_SYS}

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32

Quoted 2 lines

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 104

Quoted 2 lines
meta/recipes-devtools/gcc/gcc-runtime.inc +0 -0
             else
                     ln -s ${TARGET_SYS}

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux

Quoted 5 lines

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () {

Quoted 5 lines
meta/recipes-devtools/gcc/gcc-runtime.inc +0 -4
             fi
-    fi
-    if [ "${TARGET_OS}" = "linux-gnux32" ]; then
-            if [ "${MULTILIBS}" != "" ]; then
-                    mkdir

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 111

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +0 -1
-                    ln -s ../${TARGET_SYS}

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32

Quoted 2 lines

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 107

Quoted 2 lines
meta/recipes-devtools/gcc/gcc-runtime.inc +2 -0
+    elif [ "${TARGET_OS}" = "linux-gnux32" ]; then
+            if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a

"${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 108

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
+                    mkdir

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 109

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
+                    ln -s ../${TARGET_SYS}

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32

Quoted 2 lines

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 111

Quoted 2 lines
meta/recipes-devtools/gcc/gcc-runtime.inc +2 -0
+            elif [ "${MULTILIB_VARIANTS}" != "" ]; then
+                    mkdir

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 112

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
+                    ln -s ../${TARGET_SYS}

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32

Quoted 2 lines

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 114

Quoted 2 lines
meta/recipes-devtools/gcc/gcc-runtime.inc +0 -0
             else
                     ln -s ${TARGET_SYS}

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux

Quoted 2 lines

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 116

Quoted 2 lines
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
             fi
+    elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a

"${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 117

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
+            mkdir

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 118

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
+            ln -s ../${TARGET_SYS}/bits

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits

Quoted 1 line

meta/recipes-devtools/gcc/gcc-runtime.inc do_install_append_class-target () { · line 119

Quoted 1 line
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -0
+            ln -s ../${TARGET_SYS}/ext

${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext

Quoted 11 lines
Quoted 11 lines
meta/recipes-devtools/gcc/gcc-runtime.inc +0 -1
     fi
 
     if [ "${TCLIBC}" != "glibc" ]; then
--

2.7.4

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
BRs

Sandy(Li Changqing)

#15 lore raw
Quoted 8 lines · Martin Jansa

Hi,

see the fix here:
http://lists.openembedded.org/pipermail/openembedded-core/2019-June/283928.html

I think it doesn't need additional explanation.

Any aarch64/arm multilib configuration should trigger this (or anything where TARGET_OS isn't just "linux").

Thanks.

Quoted 178 lines

Regards,

On Fri, Jun 21, 2019 at 11:08 AM Changqing Li <[email protected] <mailto:[email protected]>> wrote:

    On 6/21/19 4:32 PM, Martin Jansa wrote:
    > On Tue, Jun 18, 2019 at 03:46:56PM +0800,
    [email protected] <mailto:[email protected]> wrote:
    >> From: Changqing Li <[email protected]
    <mailto:[email protected]>>
    >>
    >> The SDK was unable to find the C++ header pieces correctly
    since it's
    >> using a generic compiler, not one specifically targeting the
    multilib
    >> vendor prefix and default tune.  This adds the right mapping to
    ensure
    >> SDKs work as expected. And fix problem in below configurations:
    >>
    >> multilib configuration 1:
    >> MACHINE="qemumips64"
    >> MULTILIBS ?= "multilib:lib32 multilib:libn32"
    >> DEFAULTTUNE_virtclass-multilib-lib32 ?= "mips"
    >> DEFAULTTUNE_virtclass-multilib-libn32 ?= "mips64-n32"
    >> MULTILIB_GLOBAL_VARIANTS_append = " libn32"
    >> require conf/multilib.conf
    >>
    >> ignoring nonexistent directory
    "<path>/sysroots/mips64-poky-linux/usr/include/c++/8.2.0/mips64-poky-linux/32
    >>
    >> multilib configuration 2:
    >> MACHINE="qemumips64"
    >> MULTILIBS = 'multilib:lib64 multilib:lib32'
    >> DEFAULTTUNE = 'mips64-n32'
    >> DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64'
    >> DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2'
    >> require conf/multilib.conf
    >>
    >> For this configuration:
    >> for target gcc-runtime, need to create symlink like
    mips64-poly-linux --> mips64-poky-linux-gnu32
    >> for target lib64-gcc-runtime, need to create symlink like
    mips64-poly-linux/32 --> mips64-pokymllib64-linux
    >> in order to avoid conflict during populate_sdk, create symlink
    for subfoler bits/ext for target gcc-runtime,
    >> this is ugly, but seems no better way to cover all kinds of
    configuration.
    >>
    >> single lib configuration:
    >> MACHINE="qemumips64"
    >> DEFAULTTUNE = "mips64-n32"
    > This seems to be causing:
    >
    > ln: failed to create symbolic link
    'work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oe-linux-gnueabi/bits':
    No such file or directory
    > WARNING: exit code 1 from a shell command.
    > ERROR: Function failed: do_install (log file is located at
    work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/temp/log.do_install.31049)
    >
    > There is only empty directory without the -gnueabi suffix:
    >
    work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oe-linux/
    >
    > and
    >
    >
    work/aarch64-oemllib32-linux-gnueabi/lib32-gcc-runtime/9.1.0-r0/image/usr/include/c++/9.1.0/arm-oemllib32-linux-gnueabi/
    > bits  ext

    Could you send your configuration like this? Thanks.

    MACHINE="qemumips64"
    MULTILIBS = 'multilib:lib64 multilib:lib32'
    DEFAULTTUNE = 'mips64-n32'
    DEFAULTTUNE_virtclass-multilib-lib64 = 'mips64'
    DEFAULTTUNE_virtclass-multilib-lib32 = 'mips32r2'
    require conf/multilib.conf

    >> Signed-off-by: Changqing Li <[email protected]
    <mailto:[email protected]>>
    >> ---
    >>   meta/recipes-devtools/gcc/gcc-runtime.inc | 29
    +++++++++++++++++------------
    >>   1 file changed, 17 insertions(+), 12 deletions(-)
    >>
    >> diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc
    b/meta/recipes-devtools/gcc/gcc-runtime.inc
    >> index 3d03d8e..ba767e1 100644
    >> --- a/meta/recipes-devtools/gcc/gcc-runtime.inc
    >> +++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
    >> @@ -86,10 +86,6 @@ do_install () {
    >>      if [ -d ${D}${infodir} ]; then
    >>              rmdir --ignore-fail-on-non-empty -p ${D}${infodir}
    >>      fi
    >> -    if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a
    "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
    >> -            ln -s ${TARGET_SYS}
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}
    >> -    fi
    >> -
    >>   }
    >>
    >>   do_install_append_class-target () {
    >> @@ -98,20 +94,29 @@ do_install_append_class-target () {
    >>      fi
    >>
    >>      if [ "${TARGET_OS}" = "linux-gnun32" ]; then
    >> -            if [ "${MULTILIBS}" != "" ]; then
    >> -                    mkdir
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux
    >> -                    ln -s ../${TARGET_SYS}
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-pokymllib64-linux/32
    >> +            if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a
    "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
    >> +                    mkdir
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
    >> +                    ln -s ../${TARGET_SYS}
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/32
    >> +            elif [ "${MULTILIB_VARIANTS}" != "" ]; then
    >> +                    mkdir
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
    >> +                    ln -s ../${TARGET_SYS}
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
    >>              else
    >>                      ln -s ${TARGET_SYS}
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
    >>              fi
    >> -    fi
    >> -    if [ "${TARGET_OS}" = "linux-gnux32" ]; then
    >> -            if [ "${MULTILIBS}" != "" ]; then
    >> -                    mkdir
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux
    >> -                    ln -s ../${TARGET_SYS}
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}-poky-linux/x32
    >> +    elif [ "${TARGET_OS}" = "linux-gnux32" ]; then
    >> +            if [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a
    "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
    >> +                    mkdir
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
    >> +                    ln -s ../${TARGET_SYS}
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux/x32
    >> +            elif [ "${MULTILIB_VARIANTS}" != "" ]; then
    >> +                    mkdir
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
    >> +                    ln -s ../${TARGET_SYS}
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux/32
    >>              else
    >>                      ln -s ${TARGET_SYS}
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
    >>              fi
    >> +    elif [ "${TARGET_VENDOR_MULTILIB_ORIGINAL}" != "" -a
    "${TARGET_VENDOR}" != "${TARGET_VENDOR_MULTILIB_ORIGINAL}" ]; then
    >> +            mkdir
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-linux
    >> +            ln -s ../${TARGET_SYS}/bits
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/bits
    >> +            ln -s ../${TARGET_SYS}/ext
    ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR_MULTILIB_ORIGINAL}-${TARGET_OS}/ext
    >>      fi
    >>
    >>      if [ "${TCLIBC}" != "glibc" ]; then
    >> --
    >> 2.7.4
    >>
    >> --
    >> _______________________________________________
    >> Openembedded-core mailing list
    >> [email protected]
    <mailto:[email protected]>
    >> http://lists.openembedded.org/mailman/listinfo/openembedded-core

    -- 
    BRs

    Sandy(Li Changqing)
Signature · 3 lines
BRs

Sandy(Li Changqing)