diff options
author | Sinan Kaya <okaya@kernel.org> | 2019-01-31 19:09:40 +0000 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2019-04-14 17:13:50 -0400 |
commit | aed85f4d0c5686d8e202e0d24699d71c1759b455 (patch) | |
tree | 8405800dfd76f02d82f239362e0a1815939cbadb | |
parent | 3f850b745ca5a640a38516fce5393318cc78cacc (diff) | |
download | meta-selinux-aed85f4d0c5686d8e202e0d24699d71c1759b455.tar.gz |
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.inc | 20 |
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 @@ | |||
1 | do_install_append () { | 1 | do_install_append () { |
2 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} -a -e ${D}${libdir}/libpcre.so ]; then | 2 | # This code creates libpcre for both the dev machine (SDK native) |
3 | realsofile=`readlink ${D}${libdir}/libpcre.so` | 3 | # and for cross-compiling (machine arch). For Linux (SDK Linux native |
4 | mkdir -p ${D}/${base_libdir}/ | 4 | # + all machine arch), symlinks to the .so files have to be created, |
5 | mv -f ${D}${libdir}/libpcre.so.* ${D}${base_libdir}/ | 5 | # but not for the Windows SDK native. |
6 | relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} | 6 | if [ ${TARGET_OS} != "mingw32" ]; then |
7 | ln -sf ${relpath}/${realsofile} ${D}${libdir}/libpcre.so | 7 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} -a -e ${D}${libdir}/libpcre.so ]; then |
8 | ln -sf ${relpath}/${realsofile} ${D}${libdir}/libpcre.so.1 | 8 | realsofile=`readlink ${D}${libdir}/libpcre.so` |
9 | mkdir -p ${D}/${base_libdir}/ | ||
10 | mv -f ${D}${libdir}/libpcre.so.* ${D}${base_libdir}/ | ||
11 | relpath=${@os.path.relpath("${base_libdir}", "${libdir}")} | ||
12 | ln -sf ${relpath}/${realsofile} ${D}${libdir}/libpcre.so | ||
13 | ln -sf ${relpath}/${realsofile} ${D}${libdir}/libpcre.so.1 | ||
14 | fi | ||
9 | fi | 15 | fi |
10 | } | 16 | } |
11 | 17 | ||