diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-09-16 08:42:25 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-09-16 08:42:25 +0000 |
| commit | c02179bd0c04e122368c5862eee1dc390cb95599 (patch) | |
| tree | 49cf174c6b2f5c20578d8809b2f891cedd93dd86 /packages/glibc | |
| parent | bd11c73fc1aaf59a0f21fc4ad173ab17388ecaa1 (diff) | |
| parent | 142e8ecfb668ea932ae55198d67c64ab59d092ac (diff) | |
propagate from branch 'org.openembedded.dev' (head 97e2b25c7bdda7a64ccb33ddc8235de3638a0749)
to branch 'org.openembedded.dev.avr32' (head 56e7ad184e2407b765afc6cd46fac74bd31b0447)
Diffstat (limited to 'packages/glibc')
| -rw-r--r-- | packages/glibc/eglibc-svn/export-fcntl2.patch | 11 | ||||
| -rw-r--r-- | packages/glibc/eglibc_svn.bb | 1 | ||||
| -rw-r--r-- | packages/glibc/glibc-package.bbclass | 7 |
3 files changed, 5 insertions, 14 deletions
diff --git a/packages/glibc/eglibc-svn/export-fcntl2.patch b/packages/glibc/eglibc-svn/export-fcntl2.patch deleted file mode 100644 index 0bf6c57852..0000000000 --- a/packages/glibc/eglibc-svn/export-fcntl2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libc/io/Makefile.orig 2007-08-07 17:41:33.000000000 -0700 -+++ libc/io/Makefile 2007-08-07 17:42:25.000000000 -0700 -@@ -23,7 +23,7 @@ subdir := io - - headers := sys/stat.h bits/stat.h sys/statfs.h bits/statfs.h sys/vfs.h \ - sys/statvfs.h bits/statvfs.h fcntl.h sys/fcntl.h bits/fcntl.h \ -- poll.h sys/poll.h bits/poll.h \ -+ poll.h sys/poll.h bits/poll.h bits/fcntl2.h \ - utime.h ftw.h fts.h sys/sendfile.h - - routines := \ diff --git a/packages/glibc/eglibc_svn.bb b/packages/glibc/eglibc_svn.bb index 0b69283681..1fe67d46fe 100644 --- a/packages/glibc/eglibc_svn.bb +++ b/packages/glibc/eglibc_svn.bb @@ -5,7 +5,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.6+svnr${SRCREV}" PR = "r1" SRC_URI = "svn://svn.eglibc.org;module=trunk \ - file://export-fcntl2.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/trunk/libc" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index 63feb46f34..ba105d02c3 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -147,8 +147,11 @@ do_prep_locale_tree() { gunzip $i done ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib - if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib + if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then + cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib + fi + if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then + cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib fi install -m 0755 ${D}${bindir}/localedef $treedir/bin } |