diff options
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 | 84 |
1 files changed, 84 insertions, 0 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 new file mode 100644 index 0000000000..0a5fb349c0 --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch | |||
@@ -0,0 +1,84 @@ | |||
1 | Nitin A Kamble <nitin.a.kamble@intel.com> 2011/06/09 | ||
2 | UpstreamStatus: Pending | ||
3 | |||
4 | Avoid these kinds of errors while doing cross build: | ||
5 | |||
6 | | 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 | ||
7 | | 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 | ||
8 | | /usr/bin/ld: i386 architecture of input file `btrfsctl.o' is incompatible with i386:x86-64 output | ||
9 | | /usr/bin/ld: i386 architecture of input file `ctree.o' is incompatible with i386:x86-64 output | ||
10 | |||
11 | Index: git/Makefile | ||
12 | =================================================================== | ||
13 | --- git.orig/Makefile | ||
14 | +++ git/Makefile | ||
15 | @@ -38,53 +38,53 @@ version: | ||
16 | bash version.sh | ||
17 | |||
18 | btrfs: $(objects) btrfs.o btrfs_cmds.o | ||
19 | - gcc $(CFLAGS) -o btrfs btrfs.o btrfs_cmds.o \ | ||
20 | + $(CC) $(CFLAGS) -o btrfs btrfs.o btrfs_cmds.o \ | ||
21 | $(objects) $(LDFLAGS) $(LIBS) | ||
22 | |||
23 | btrfsctl: $(objects) btrfsctl.o | ||
24 | - gcc $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS) | ||
25 | + $(CC) $(CFLAGS) -o btrfsctl btrfsctl.o $(objects) $(LDFLAGS) $(LIBS) | ||
26 | |||
27 | btrfs-vol: $(objects) btrfs-vol.o | ||
28 | - gcc $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS) | ||
29 | + $(CC) $(CFLAGS) -o btrfs-vol btrfs-vol.o $(objects) $(LDFLAGS) $(LIBS) | ||
30 | |||
31 | btrfs-show: $(objects) btrfs-show.o | ||
32 | - gcc $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS) | ||
33 | + $(CC) $(CFLAGS) -o btrfs-show btrfs-show.o $(objects) $(LDFLAGS) $(LIBS) | ||
34 | |||
35 | btrfsck: $(objects) btrfsck.o | ||
36 | - gcc $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS) | ||
37 | + $(CC) $(CFLAGS) -o btrfsck btrfsck.o $(objects) $(LDFLAGS) $(LIBS) | ||
38 | |||
39 | mkfs.btrfs: $(objects) mkfs.o | ||
40 | - gcc $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS) | ||
41 | + $(CC) $(CFLAGS) -o mkfs.btrfs $(objects) mkfs.o $(LDFLAGS) $(LIBS) | ||
42 | |||
43 | btrfs-debug-tree: $(objects) debug-tree.o | ||
44 | - gcc $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS) | ||
45 | + $(CC) $(CFLAGS) -o btrfs-debug-tree $(objects) debug-tree.o $(LDFLAGS) $(LIBS) | ||
46 | |||
47 | btrfs-zero-log: $(objects) btrfs-zero-log.o | ||
48 | - gcc $(CFLAGS) -o btrfs-zero-log $(objects) btrfs-zero-log.o $(LDFLAGS) $(LIBS) | ||
49 | + $(CC) $(CFLAGS) -o btrfs-zero-log $(objects) btrfs-zero-log.o $(LDFLAGS) $(LIBS) | ||
50 | |||
51 | btrfs-select-super: $(objects) btrfs-select-super.o | ||
52 | - gcc $(CFLAGS) -o btrfs-select-super $(objects) btrfs-select-super.o $(LDFLAGS) $(LIBS) | ||
53 | + $(CC) $(CFLAGS) -o btrfs-select-super $(objects) btrfs-select-super.o $(LDFLAGS) $(LIBS) | ||
54 | |||
55 | btrfstune: $(objects) btrfstune.o | ||
56 | - gcc $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS) | ||
57 | + $(CC) $(CFLAGS) -o btrfstune $(objects) btrfstune.o $(LDFLAGS) $(LIBS) | ||
58 | |||
59 | btrfs-map-logical: $(objects) btrfs-map-logical.o | ||
60 | - gcc $(CFLAGS) -o btrfs-map-logical $(objects) btrfs-map-logical.o $(LDFLAGS) $(LIBS) | ||
61 | + $(CC) $(CFLAGS) -o btrfs-map-logical $(objects) btrfs-map-logical.o $(LDFLAGS) $(LIBS) | ||
62 | |||
63 | btrfs-image: $(objects) btrfs-image.o | ||
64 | - gcc $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS) | ||
65 | + $(CC) $(CFLAGS) -o btrfs-image $(objects) btrfs-image.o -lpthread -lz $(LDFLAGS) $(LIBS) | ||
66 | |||
67 | dir-test: $(objects) dir-test.o | ||
68 | - gcc $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS) | ||
69 | + $(CC) $(CFLAGS) -o dir-test $(objects) dir-test.o $(LDFLAGS) $(LIBS) | ||
70 | |||
71 | quick-test: $(objects) quick-test.o | ||
72 | - gcc $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS) | ||
73 | + $(CC) $(CFLAGS) -o quick-test $(objects) quick-test.o $(LDFLAGS) $(LIBS) | ||
74 | |||
75 | convert: $(objects) convert.o | ||
76 | - gcc $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs -lcom_err $(LDFLAGS) $(LIBS) | ||
77 | + $(CC) $(CFLAGS) -o btrfs-convert $(objects) convert.o -lext2fs -lcom_err $(LDFLAGS) $(LIBS) | ||
78 | |||
79 | ioctl-test: $(objects) ioctl-test.o | ||
80 | - gcc $(CFLAGS) -o ioctl-test $(objects) ioctl-test.o $(LDFLAGS) $(LIBS) | ||
81 | + $(CC) $(CFLAGS) -o ioctl-test $(objects) ioctl-test.o $(LDFLAGS) $(LIBS) | ||
82 | |||
83 | manpages: | ||
84 | cd man; make | ||