summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/postgresql/postgresql.inc
diff options
context:
space:
mode:
authorGeorge McCollister <george.mccollister@gmail.com>2015-11-12 12:35:36 -0600
committerMartin Jansa <Martin.Jansa@gmail.com>2015-12-18 12:42:08 +0100
commitb2bf995c4e68f0eb434549ed512e06313fa67881 (patch)
tree61e89f2bfbea2b75861b6760736524c01b7b9d9f /meta-oe/recipes-support/postgresql/postgresql.inc
parent49e6d6103e35e1646674c6fd7e70c387b1b127b4 (diff)
downloadmeta-openembedded-b2bf995c4e68f0eb434549ed512e06313fa67881.tar.gz
postgresql: Don't symlink to perl if it's disabled
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>
Diffstat (limited to 'meta-oe/recipes-support/postgresql/postgresql.inc')
-rw-r--r--meta-oe/recipes-support/postgresql/postgresql.inc18
1 files changed, 10 insertions, 8 deletions
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc
index f3ff22583..dbc02a013 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -141,14 +141,16 @@ do_configure() {
141 -e "/^TCLSH/s:=.*:= ${bindir}/tclsh:g" \ 141 -e "/^TCLSH/s:=.*:= ${bindir}/tclsh:g" \
142 ${B}/src/Makefile.global 142 ${B}/src/Makefile.global
143 143
144 # workaround perl package's libperl.so problem 144 if ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'true', 'false', d)}; then
145 # we are using perlnative so this perl should have same version 145 # workaround perl package's libperl.so problem
146 perl_version=`perl -v 2>/dev/null | \ 146 # we are using perlnative so this perl should have same version
147 sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'` 147 perl_version=`perl -v 2>/dev/null | \
148 if [ ! -h "${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so" -a \ 148 sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'`
149 ! -h "${STAGING_LIBDIR}/libperl.so" ]; then 149 if [ ! -h "${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so" -a \
150 ln -sf ../../../libperl.so.5 \ 150 ! -h "${STAGING_LIBDIR}/libperl.so" ]; then
151 ${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so 151 ln -sf ../../../libperl.so.5 \
152 ${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so
153 fi
152 fi 154 fi
153} 155}
154 156