Skip to contentSkip to conversation

bitbake.conf: Add mingw32 SOLIBS and SOLIBSDEV definitions

PATCH New Richard Purdie 1 participant 2 messages Sep 19, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 bitbake.conf: Add mingw32 SOLIBS and SOLIBSDEV definitions

We may as well define the dll output for mingw alongside the darwin dylib definitions. There are some recipes which output .so files even on mingw but those can be handled specifically in mingw.

---
 meta/conf/bitbake.conf | 2 ++
 1 file changed, 2 insertions(+)
meta/conf/bitbake.conf +2 -0
index ab4c6a2d9c9..3f583668f66 100644
@@ -307,12 +307,14 @@ BB_MULTI_PROVIDER_ALLOWED = "virtual/libintl virtual/libintl-native virtual/nati
 
 SOLIBS = ".so.*"
 SOLIBS:darwin = ".dylib"
+SOLIBS:mingw32 = ".dll"
 
 SOLIBSDEV = ".so"
 # Due to the ordering of PACKAGES and the naming of the dev symlinks on darwin,
 # we can't make the symlinks end up in the -dev packages easily at this point. This hack
 # at least means builds aren't completely broken and symlinks don't take up much space.
 SOLIBSDEV:darwin = ".dylibbroken"
+SOLIBSDEV:mingw32 = ".dll"
 
 PACKAGE_DEBUG_SPLIT_STYLE ?= "debug-with-srcpkg"
 
#1 lore raw

PATCH 2/2 binutils: Fix binutils mingw packaging

Use SOLIBSDEV in FILES to fix nativesdk-binutils packaging on mingw builds.

---
 meta/recipes-devtools/binutils/binutils.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/binutils/binutils.inc +1 -1
index e176b5cff1a..e1b903f1ebf 100644
@@ -18,7 +18,7 @@ inherit autotools gettext multilib_header pkgconfig texinfo
 FILES:${PN} = " \
 	${bindir}/${TARGET_PREFIX}* \
 	${libdir}/lib*.so.* \
-	${libdir}/bfd-plugins/lib*.so \
+	${libdir}/bfd-plugins/lib*${SOLIBSDEV} \
 	${libdir}/lib*-${PV}*.so \
 	${prefix}/${TARGET_SYS}/bin/* \
         ${bindir}/embedspu"