[meta-selinux,v1] libpcre: do no create links when compiling for windows

Submitted by Sinan Kaya on Jan. 31, 2019, 7:09 p.m. | Patch ID: 158414

Details

Message ID 20190131190940.17531-1-okaya@kernel.org
State New
Headers show

Commit Message

Sinan Kaya Jan. 31, 2019, 7:09 p.m.
lipcre-native is trying to create symbolic links to so files
when used with meta-mingw. Remove this condition for mingw builds.

Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 recipes-support/libpcre/libpcre_selinux.inc | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/recipes-support/libpcre/libpcre_selinux.inc b/recipes-support/libpcre/libpcre_selinux.inc
index 59c0184..dc287d7 100644
--- a/recipes-support/libpcre/libpcre_selinux.inc
+++ b/recipes-support/libpcre/libpcre_selinux.inc
@@ -1,11 +1,17 @@ 
 do_install_append () {
-	if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
-		realsofile=`readlink ${D}${libdir}/libpcre.so`
-		mkdir -p ${D}/${base_libdir}/
-		mv -f ${D}${libdir}/libpcre.so.* ${D}${base_libdir}/
-		relpath=${@os.path.relpath("${base_libdir}", "${libdir}")}
-		ln -sf ${relpath}/${realsofile} ${D}${libdir}/libpcre.so
-		ln -sf ${relpath}/${realsofile} ${D}${libdir}/libpcre.so.1
+	# This code creates libpcre for both the dev machine (SDK native)
+	# and for cross-compiling (machine arch). For Linux (SDK Linux native
+	# + all machine arch), symlinks to the .so files have to be created,
+	# but not for the Windows SDK native.
+	if [ ${TARGET_OS} != "mingw32" ]; then
+		if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+			realsofile=`readlink ${D}${libdir}/libpcre.so`
+			mkdir -p ${D}/${base_libdir}/
+			mv -f ${D}${libdir}/libpcre.so.* ${D}${base_libdir}/
+			relpath=${@os.path.relpath("${base_libdir}", "${libdir}")}
+			ln -sf ${relpath}/${realsofile} ${D}${libdir}/libpcre.so
+			ln -sf ${relpath}/${realsofile} ${D}${libdir}/libpcre.so.1
+		fi
 	fi
 }