diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-02-29 15:59:47 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-02-29 15:59:47 +0000 |
| commit | d8618d0ce0ee1bf7ad72efac9cbf5626a2897698 (patch) | |
| tree | fc29126a2695526378cef852bc57bf7b6d219df5 /packages/glibc | |
| parent | 5a362b4bb805986fbb4a5e0aee08d23b62d84b05 (diff) | |
| parent | 5e33f4db5f153d6b3e3cc9c75523e9ce9288e396 (diff) | |
merge of '7ebcf65940382b7ebea258189704cb0e4a77dc70'
and 'ae9980c1d055e682beb2fea6cfddb080c495b43b'
Diffstat (limited to 'packages/glibc')
| -rw-r--r-- | packages/glibc/eglibc-initial_svn.bb | 8 | ||||
| -rw-r--r-- | packages/glibc/eglibc_svn.bb | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/glibc/eglibc-initial_svn.bb b/packages/glibc/eglibc-initial_svn.bb index 5b78d57dc4..298c775152 100644 --- a/packages/glibc/eglibc-initial_svn.bb +++ b/packages/glibc/eglibc-initial_svn.bb @@ -33,14 +33,14 @@ do_compile () { } do_stage () { - oe_runmake cross-compiling=yes install_root=${STAGING_DIR}/${HOST_SYS} includedir=/include prefix="" install-headers + oe_runmake cross-compiling=yes install_root=${STAGING_DIR_HOST} includedir=${layout_includedir} prefix="" install-headers # Two headers -- stubs.h and features.h -- aren't installed by install-headers, # so do them by hand. We can tolerate an empty stubs.h for the moment. # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html - mkdir -p ${STAGING_DIR}/${HOST_SYS}/include/gnu - touch ${STAGING_DIR}/${HOST_SYS}/include/gnu/stubs.h - cp ${S}/include/features.h ${STAGING_DIR}/${HOST_SYS}/include/features.h + mkdir -p ${STAGING_INCDIR}/gnu + touch ${STAGING_INCDIR}/gnu/stubs.h + cp ${S}/include/features.h ${STAGING_INCDIR}/features.h } do_install () { diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index ff68185bcc..a03c63b2fb 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -90,8 +90,8 @@ do_stage() { # make sure there isn't a conflicting libc in staging # this should be solved differently rm -f ${STAGING_LIBDIR}/libc.so.6 - oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \ - 'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \ + oe_runmake 'install_root=${STAGING_DIR_HOST}' \ + 'includedir=${layout_includedir}' 'libdir=${layout_libdir}' 'slibdir=${layout_base_libdir}' \ '${STAGING_LIBDIR}/libc.so.6' \ install-headers install-lib |