summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2012-01-12 17:30:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:23 +0000
commit35759f977eec6ef81e125a509a7148d7e53a6515 (patch)
tree25711959a7861226aea785fa888e89b9c9e3e834 /meta/conf
parent73a7876b27393c2e3ea6bbb110fbfd68771b8cc3 (diff)
downloadpoky-35759f977eec6ef81e125a509a7148d7e53a6515.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. (From OE-Core rev: 46bf69dcfa99a3a8677b241bb32bed2f30255ece) Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/bitbake.conf8
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"
49sbindir_native = "${prefix_native}/sbin" 49sbindir_native = "${prefix_native}/sbin"
50includedir_native = "${prefix_native}/include" 50includedir_native = "${prefix_native}/include"
51libdir_native = "${prefix_native}/lib" 51libdir_native = "${prefix_native}/lib"
52base_libdir_native = "/lib"
52datadir_native = "${prefix_native}/share" 53datadir_native = "${prefix_native}/share"
53bindir_cross = "/bin" 54bindir_cross = "/bin"
54bindir_crossscripts = "${bindir}/crossscripts" 55bindir_crossscripts = "${bindir}/crossscripts"
@@ -330,6 +331,7 @@ STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
330STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts" 331STAGING_BINDIR_CROSS = "${STAGING_BINDIR}/crossscripts"
331STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" 332STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
332STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}" 333STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
334STAGING_BASE_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${base_libdir_native}"
333STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}" 335STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
334STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}" 336STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
335STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}" 337STAGING_DATADIR_NATIVE = "${STAGING_DIR_NATIVE}${datadir_native}"
@@ -462,8 +464,12 @@ export CXXFLAGS = "${TARGET_CXXFLAGS}"
462export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive" 464export TARGET_CXXFLAGS = "${TARGET_CFLAGS} -fpermissive"
463 465
464export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \ 466export BUILD_LDFLAGS = "-L${STAGING_LIBDIR_NATIVE} \
467 -L${STAGING_BASE_LIBDIR_NATIVE} \
465 -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \ 468 -Wl,-rpath-link,${STAGING_LIBDIR_NATIVE} \
466 -Wl,-rpath,${STAGING_LIBDIR_NATIVE} -Wl,-O1" 469 -Wl,-rpath-link,${STAGING_BASE_LIBDIR_NATIVE} \
470 -Wl,-rpath,${STAGING_LIBDIR_NATIVE} \
471 -Wl,-rpath,${STAGING_BASE_LIBDIR_NATIVE} \
472 -Wl,-O1"
467 473
468BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \ 474BUILDSDK_LDFLAGS = "-L${STAGING_LIBDIR} \
469 -Wl,-rpath-link,${STAGING_LIBDIR} \ 475 -Wl,-rpath-link,${STAGING_LIBDIR} \