Skip to content

gcc-cross-sdk: fix C++ headers include, bump PR.

Andreas Fenkart openembedded-devel 1 version In review

Get series with b4
b4 am 20100720112607.GA9142@biggy

Versions newest first

  1. v1 Latest1 patch 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/1gcc-cross-sdk: fix C++ headers include, bump PR.recipes/gcc/gcc-4.3.1.inc recipes/gcc/gcc-4.3.2.inc recipes/gcc/gcc-4.3.3.inc +6 more+8 -100 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 0/1] gcc-cross-sdk: fix C++ headers include, bump PR.

Hi

The location of C++ headers has changed in gcc-cross-sdk_4.3.x and above. See error message during packaging step:

NOTE: the following files were installed but not shipped in any package:
NOTE: /opt/angstrom/arm/arm-angstrom-linux-uclibcgnueabi/include/c++/4.3.2/ios
NOTE: /opt/angstrom/arm/arm-angstrom-linux-uclibcgnueabi/include/c++/4.3.2/map
NOTE: /opt/angstrom/arm/arm-angstrom-linux-uclibcgnueabi/include/c++/4.3.2/new
...

NOTE: the following files were installed but not shipped in any package:
NOTE:   /opt/angstrom/arm/include/c++/4.1.1/debug/deque
NOTE:   /opt/angstrom/arm/include/c++/4.1.1/debug/map.h
NOTE:   /opt/angstrom/arm/include/c++/4.1.1/debug/safe_base.h
NOTE:   /opt/angstrom/arm/include/c++/4.1.1/debug/set.h

This latter error occurs after removing the includedir directive:

recipes/gcc/gcc-package-sdk.inc +0 -1
@@ -17,10 +17,8 @@ FILES_${PN} = "\
     ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
     ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
     ${gcclibdir}/${TARGET_SYS}/${BINV}/include* \
-    ${includedir}/c++/${BINV} \
     ${prefix}/${TARGET_SYS}/bin/* \
     ${prefix}/${TARGET_SYS}/lib/* \

My includedir definition:
export includedir="/opt/angstrom/arm/include"

This seems related to patch:
gcc-cross-sdk: Fix relocation of the toolchain and bump PR.
sha1: f8bf7421bfe8eb86a3f17f269db4fb3667260c38

The patch places C++ headers directly into /include, no longer /usr/include. So I adjusted the gcc-package-sdk.inc. I also removed the now unecessary relocation step from meta-toolchain.bb.

recipes/gcc/gcc-package-sdk.inc +1 -1
@@ -17,10 +17,8 @@ FILES_${PN} = "\
     ${prefix}/${TARGET_SYS}/bin/* \
     ${prefix}/${TARGET_SYS}/lib/* \
-    ${prefix}/${TARGET_SYS}/usr/include/* \
+    ${prefix}/${TARGET_SYS}/include/* \
     "

Tested on ARM:
gcc-cross-sdk_4.1.1 -- ok gcc-cross-sdk_4.2.4 -- ok gcc-cross-sdk_4.3.1 -- needs, patch gcc-cross-sdk_4.3.2 -- needs, patch gcc-cross-sdk_4.3.3 -- needs, patch gcc-cross-sdk_4.4.2 -- needs, patch

/Andreas

Read the cover letter in its thread