mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

postgresql: Don't symlink to perl if it's disabled

Browse Source 
Don't create a symlink to libperl.so if perl isn't in PACKAGECONFIG.
Attempting to do so will fail if perl hasn't been built.

Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
George McCollister
2015-11-12 12:35:36 -06:00
committed by Armin Kuster
parent 9fc5f4b831
commit 05f285254f
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/postgresql/postgresql.inc
+10 -8
View File
@@ -141,14 +141,16 @@ do_configure() {
-e "/^TCLSH/s:=.*:= ${bindir}/tclsh:g" \ -e "/^TCLSH/s:=.*:= ${bindir}/tclsh:g" \
${B}/src/Makefile.global ${B}/src/Makefile.global
# workaround perl package's libperl.so problem if ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'true', 'false', d)}; then
# we are using perlnative so this perl should have same version # workaround perl package's libperl.so problem
perl_version=`perl -v 2>/dev/null | \ # we are using perlnative so this perl should have same version
sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'` perl_version=`perl -v 2>/dev/null | \
if [ ! -h "${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so" -a \ sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'`
! -h "${STAGING_LIBDIR}/libperl.so" ]; then if [ ! -h "${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so" -a \
ln -sf ../../../libperl.so.5 \ ! -h "${STAGING_LIBDIR}/libperl.so" ]; then
${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so ln -sf ../../../libperl.so.5 \
${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so
fi
fi fi
} }