[oe] [PATCH 09/11] glibc: add initial-multilib

[Roman I Khimov]

---
 recipes/glibc/glibc-initial-multilib_2.6.1.bb |    7 +++++++
 recipes/glibc/glibc-initial.inc               |    6 ++++--
 recipes/glibc/glibc-multilib.inc              |    9 +++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 recipes/glibc/glibc-initial-multilib_2.6.1.bb
 create mode 100644 recipes/glibc/glibc-multilib.inc

diff --git a/recipes/glibc/glibc-initial-multilib_2.6.1.bb b/recipes/glibc/glibc-initial-multilib_2.6.1.bb
new file mode 100644
index 0000000..bd09fdb
--- /dev/null
+++ b/recipes/glibc/glibc-initial-multilib_2.6.1.bb
@@ -0,0 +1,7 @@
+require glibc_${PV}.bb
+require glibc-initial.inc
+require glibc-multilib.inc
+
+do_configure_prepend () {
+	unset CFLAGS
+}
diff --git a/recipes/glibc/glibc-initial.inc b/recipes/glibc/glibc-initial.inc
index 5528cf8..306e0a0 100644
--- a/recipes/glibc/glibc-initial.inc
+++ b/recipes/glibc/glibc-initial.inc
@@ -1,6 +1,7 @@
 SECTION = "libs"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial linux-libc-headers"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+GLIBC_PREFIX ?= "${TARGET_PREFIX}"
+DEPENDS = "virtual/${GLIBC_PREFIX}gcc-initial linux-libc-headers"
+PROVIDES = "virtual/${GLIBC_PREFIX}libc-initial"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.4', '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 
 PACKAGES = ""
@@ -33,6 +34,7 @@ do_compile () {
 do_stage () {
 	oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} \
 	includedir='${layout_includedir}' prefix='${layout_prefix}' \
+	libdir='${layout_libdir}' slibdir='${layout_base_libdir}' \
 	install-bootstrap-headers=yes install-headers
 
 	oe_runmake csu/subdir_lib
diff --git a/recipes/glibc/glibc-multilib.inc b/recipes/glibc/glibc-multilib.inc
new file mode 100644
index 0000000..910e9ee
--- /dev/null
+++ b/recipes/glibc/glibc-multilib.inc
@@ -0,0 +1,9 @@
+CC += "${CFLAGS_MULTILIB}"
+TARGET_SYS = "${TARGET_SYS_MULTILIB}"
+HOST_SYS = "${TARGET_SYS_MULTILIB}"
+TARGET_PREFIX = "${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}-"
+GLIBC_PREFIX = "${TARGET_SYS_MULTILIB}-"
+layout_libdir="${layout_exec_prefix}/${LIB_MULTILIB}"
+layout_includedir="${layout_exec_prefix}/include/${TARGET_SYS_MULTILIB}"
+layout_base_libdir="${layout_base_prefix}/${LIB_MULTILIB}"
+layout_libexecdir="${layout_libdir}"
-- 
1.6.2.1


-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.