diff options
author | Yevhen Kyriukha <kirgene@gmail.com> | 2013-08-04 19:00:11 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-06 12:39:57 +0100 |
commit | 3b0be885c48b748c3f0531fa5b73f229453f6814 (patch) | |
tree | 7a5252c0af545573a9782d2da23427bf6171b2d9 /meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch | |
parent | 63017172dadb62d8baea9b6c6a22de9d1860cccf (diff) | |
download | openembedded-core-contrib-3b0be885c48b748c3f0531fa5b73f229453f6814.tar.gz |
btrfs-tools: upgrade to upstream revision.
Two patches were removed because changes that they provide are already exist.
(From OE-Core rev: 6de68622c0658e1bba509c66c137eb419cdbdabf)
Signed-off-by: Yevhen Kyriukha <kirgene@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch')
-rw-r--r-- | meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch deleted file mode 100644 index 7f6594a343..0000000000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch +++ /dev/null @@ -1,31 +0,0 @@ -Nitin A Kamble <nitin.a.kamble@intel.com> 2011/06/09 -Upstream-Status: Pending - -Avoid these kinds of errors while doing cross build: - -| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build0/tmp/sysroots/qemux86 -Wp,-MMD,./.btrfsctl.o.d,-MT,btrfsctl.o -Wall -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -O2 -pipe -g -feliminate-unused-debug-types -c btrfsctl.c -| gcc -O2 -pipe -g -feliminate-unused-debug-types -o btrfsctl btrfsctl.o ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o root-tree.o dir-item.o file-item.o inode-item.o inode-map.o crc32c.o rbtree.o extent-cache.o extent_io.o volumes.o utils.o btrfs-list.o -Wl,-O1 -Wl,--as-needed -luuid -| /usr/bin/ld: i386 architecture of input file `btrfsctl.o' is incompatible with i386:x86-64 output -| /usr/bin/ld: i386 architecture of input file `ctree.o' is incompatible with i386:x86-64 output - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -41,13 +41,13 @@ btrfs: $(objects) btrfs.o btrfs_cmds.o s - $(objects) $(LDFLAGS) $(LIBS) - - calc-size: $(objects) calc-size.o -- gcc $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS) -+ $(CC) $(CFLAGS) -o calc-size calc-size.o $(objects) $(LDFLAGS) $(LIBS) - - find-root: $(objects) find-root.o -- gcc $(CFLAGS) -o find-root find-root.o $(objects) $(LDFLAGS) $(LIBS) -+ $(CC) $(CFLAGS) -o find-root find-root.o $(objects) $(LDFLAGS) $(LIBS) - - restore: $(objects) restore.o -- gcc $(CFLAGS) -o restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS) -+ $(CC) $(CFLAGS) -o restore restore.o $(objects) $(LDFLAGS) $(LIBS) $(RESTORE_LIBS) - - btrfsctl: $(objects) btrfsctl.o - $(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS) |