diff options
| author |   Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2012-01-12 17:30:24 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-17 14:53:01 +0000 |
| commit | 46bf69dcfa99a3a8677b241bb32bed2f30255ece (patch) | |
| tree | dceacf5d11cf96b1e5218b5d92029cb5f0dd6f23 /meta | |
| parent | 536eb4946c25ecb7b6966d293ff1116c46680c96 (diff) | |
| download | openembedded-core-contrib-46bf69dcfa99a3a8677b241bb32bed2f30255ece.tar.gz | |
bitbake.conf: search /lib for -native builds
Changes to BUILD_LDFLAGS are required due to the recent movement of some
libraries from ${libdir} to ${base_libdir}. ${base_libdir} must be now
in the linker search path to avoid build problems of -native packages.
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/bitbake.conf | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 43eedad046..d0513637d0 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -49,6 +49,7 @@ bindir_native = "${prefix_native}/bin" sbindir_native = "${prefix_native}/sbin" includedir_native = "${prefix_native}/include" libdir_native = "${prefix_native}/lib" +base_libdir_native = "/lib" datadir_native = "${prefix_native}/share" bindir_cross = "/bin" bindir_crossscripts = "${bindir}/crossscripts" @@ -330,6 +331,7 @@ STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts" STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" +STAGING_BASE_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${base_libdir_native}" STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}" @@ -462,8 +464,12 @@ export CXXFLAGS = "${TARGET_CXXFLAGS}" export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive" export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ + -L${STAGING_BASE_LIBDIR_NATIVE} \ -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \ - -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1" + -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} \ + -Wl,-rpath,${STAGING_LIBDIR_NATIVE} \ + -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE} \ + -Wl,-O1" BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \ -Wl,-rpath-link,${STAGING_LIBDIR} \ |