All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH][meta-oe] postgresql: Don't symlink to perl if it's disabled
@ 2015-11-12 18:35 George McCollister
  0 siblings, 0 replies; only message in thread
From: George McCollister @ 2015-11-12 18:35 UTC (permalink / raw)
  To: openembedded-devel

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>
---
 meta-oe/recipes-support/postgresql/postgresql.inc | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc
index f3ff225..dbc02a0 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -141,14 +141,16 @@ do_configure() {
         -e "/^TCLSH/s:=.*:= ${bindir}/tclsh:g" \
     ${B}/src/Makefile.global
 
-    # workaround perl package's libperl.so problem
-    # we are using perlnative so this perl should have same version
-    perl_version=`perl -v 2>/dev/null | \
-        sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'`
-    if [ ! -h "${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so" -a \
-         ! -h "${STAGING_LIBDIR}/libperl.so" ]; then
-        ln -sf ../../../libperl.so.5 \
-            ${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so
+    if ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'true', 'false', d)}; then
+        # workaround perl package's libperl.so problem
+        # we are using perlnative so this perl should have same version
+        perl_version=`perl -v 2>/dev/null | \
+            sed -n 's/This is perl.*v[a-z ]*\([0-9]\.[0-9][0-9.]*\).*$/\1/p'`
+        if [ ! -h "${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so" -a \
+             ! -h "${STAGING_LIBDIR}/libperl.so" ]; then
+            ln -sf ../../../libperl.so.5 \
+                ${STAGING_LIBDIR}/perl/$perl_version/CORE/libperl.so
+        fi
     fi
 }
 
-- 
2.4.5



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-11-12 18:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-12 18:35 [PATCH][meta-oe] postgresql: Don't symlink to perl if it's disabled George McCollister

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.