Fix for GCC missing liblto_plugin.so

PATCH Applied Saul Wold 2 participants 3 messages Jul 12, 2011

lore

Share & tools

lore

Saul Wold

author

2011-07-12 07:24 UTC #0 lore raw

cover Fix for GCC missing liblto_plugin.so

Richard,

This is the patch for the missing liblto_plugin.so issue, minor correction of how things get packaged.

Sau!

The following changes since commit e66c2999afa2b3efbce8bb46c89f9db5e15f35c7:

libx11: ensure nativesdk uses correct DEPENDS and XCB flags (2011-07-10 09:49:06 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix

Saul Wold (1):
gcc: Fix packaging correctly

 meta/recipes-devtools/gcc/gcc-4.6.inc            |    2 +-
 meta/recipes-devtools/gcc/gcc-package-target.inc |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

Signature · 1 line

1.7.3.4

Saul Wold

author

2011-07-12 07:24 UTC #1 lore raw

PATCH 1/1 gcc: Fix packaging correctly

[YOCTO #1233]

This fix directly packages the contents in and adds the lib*.so correctly to the -dev package.

Signed-off-by Saul Wold <[email protected]>

---
 meta/recipes-devtools/gcc/gcc-4.6.inc            |    2 +-
 meta/recipes-devtools/gcc/gcc-package-target.inc |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

meta/recipes-devtools/gcc/gcc-4.6.inc +1 -1

index a880111..56064b5 100644
@@ -1,6 +1,6 @@
 require gcc-common.inc
 
-PR = "r6"
+PR = "r8"
 
 # Third digit in PV should be incremented after a minor release
 # happens from this branch on gcc e.g. currently its 4.6.0

meta/recipes-devtools/gcc/gcc-package-target.inc +6 -3

index 69abf72..9a91a7f 100644
@@ -14,10 +14,12 @@ FILES_${PN} = "\
   ${bindir}/${TARGET_PREFIX}gcc \
   ${bindir}/${TARGET_PREFIX}gccbug \
   ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
-  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/* \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
-  ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
   ${gcclibdir}/${TARGET_SYS}/${BINV}/include-fixed \
 "

@@ -26,6 +28,8 @@ FILES_${PN}-dbg += "\
 "
 FILES_${PN}-dev = "\
   ${gcclibdir}/${TARGET_SYS}/${BINV}/plugin/include/ \
+  ${gcclibdir}/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
+  ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBSDEV} \
 "
 FILES_${PN}-symlinks = "\
   ${bindir}/cc \

@@ -80,7 +84,6 @@ do_install () {
 	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
 	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
 	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
-	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.so
 	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
 
 	# Hack around specs file assumptions

Signature · 1 line

1.7.3.4

Richard Purdie

Applied

2011-07-12 13:54 UTC #2 lore raw

In reply to Saul Wold

Quoted 10 lines · Saul Wold

Richard,
This is the patch for the missing liblto_plugin.so issue, minor correction of how things get packaged.
Sau!
The following changes since commit e66c2999afa2b3efbce8bb46c89f9db5e15f35c7:

Quoted 8 lines

libx11: ensure nativesdk uses correct DEPENDS and XCB flags (2011-07-10 09:49:06 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Saul Wold (1):
gcc: Fix packaging correctly

Merged to master, thanks.

Richard