aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSinan Kaya <okaya@kernel.org>2019-01-31 19:09:40 +0000
committerJoe MacDonald <joe@deserted.net>2019-04-14 17:13:50 -0400
commitaed85f4d0c5686d8e202e0d24699d71c1759b455 (patch)
tree8405800dfd76f02d82f239362e0a1815939cbadb
parent3f850b745ca5a640a38516fce5393318cc78cacc (diff)
downloadmeta-selinux-aed85f4d0c5686d8e202e0d24699d71c1759b455.tar.gz
meta-selinux-aed85f4d0c5686d8e202e0d24699d71c1759b455.tar.bz2
meta-selinux-aed85f4d0c5686d8e202e0d24699d71c1759b455.zip
libpcre: do no create links when compiling for windows
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> Signed-off-by: Joe MacDonald <joe@deserted.net>
-rw-r--r--recipes-support/libpcre/libpcre_selinux.inc20
1 files changed, 13 insertions, 7 deletions
diff --git a/recipes-support/libpcre/libpcre_selinux.inc b/recipes-support/libpcre/libpcre_selinux.inc
index d886792..3810078 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} -a -e ${D}${libdir}/libpcre.so ]; 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} -a -e ${D}${libdir}/libpcre.so ]; 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
}