]> code.ossystems Code Review - openembedded-core.git/commitdiff
ncurses: Only set LD_LIBRARY_PATH within the do_install
authorRichard Purdie <rpurdie@linux.intel.com>
Sat, 2 Oct 2010 17:08:19 +0000 (18:08 +0100)
committerRichard Purdie <rpurdie@linux.intel.com>
Sat, 2 Oct 2010 17:09:14 +0000 (18:09 +0100)
If this is done as a global export it can affect the whole task and the
wrong python libraries can be found for example.

[BUGID #335]

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
meta/recipes-core/ncurses/ncurses.inc

index 259750cb460bc04e2e3b61386f6b9159caef7152..8cfc5e4885bb890b2653207e034eb5d124ec46f5 100644 (file)
@@ -40,11 +40,11 @@ export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
 export BUILD_LDFLAGS = ""
 export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
 
-# This is necessary so that the "tic" command executed during the install can
-# link with the correct libary in staging.
-export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
-
 do_install() {
+       # This is necessary so that the "tic" command executed during the install can
+       # link with the correct libary in staging.
+       export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}"
+
        autotools_do_install
 
        ln -sf curses.h ${D}${includedir}/ncurses.h