diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch | 40 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.22.1.bb | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch b/meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch new file mode 100644 index 0000000000..3da38bb4ca --- /dev/null +++ b/meta/recipes-core/busybox/busybox/0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 28389e59701c2408e87e886c358f8e1766c677f7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Drew Moseley <drew_moseley@mentor.com> | ||
3 | Date: Sat, 29 Mar 2014 11:13:16 -0400 | ||
4 | Subject: [PATCH] build system: Specify '-nostldlib' when linking to .o files. | ||
5 | |||
6 | For certain cross build scenarios the LD variable is overridden | ||
7 | to use the gcc executive to ensure all the target tuning parameters | ||
8 | are used. In these cases, the executive errors out as shown below | ||
9 | but since this step is only linking to a .o file the standard libs | ||
10 | are not needed. | ||
11 | |||
12 | $ make LD=gcc applets/built-in.o | ||
13 | LD applets/built-in.o | ||
14 | /usr/bin/ld: cannot find -lgcc_s | ||
15 | /usr/bin/ld: cannot find -lgcc_s | ||
16 | collect2: ld returned 1 exit status | ||
17 | make[1]: *** [applets/built-in.o] Error 1 | ||
18 | make: *** [applets_dir] Error 2 | ||
19 | |||
20 | Signed-off-by: Drew Moseley <drew_moseley@mentor.com> | ||
21 | --- | ||
22 | scripts/Makefile.build | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/scripts/Makefile.build b/scripts/Makefile.build | ||
26 | index 5685b5b..eba69f6 100644 | ||
27 | --- a/scripts/Makefile.build | ||
28 | +++ b/scripts/Makefile.build | ||
29 | @@ -256,7 +256,7 @@ ifdef builtin-target | ||
30 | quiet_cmd_link_o_target = LD $@ | ||
31 | # If the list of objects to link is empty, just create an empty built-in.o | ||
32 | cmd_link_o_target = $(if $(strip $(obj-y)),\ | ||
33 | - $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\ | ||
34 | + $(LD) -nostdlib $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\ | ||
35 | rm -f $@; $(AR) rcs $@) | ||
36 | |||
37 | $(builtin-target): $(obj-y) FORCE | ||
38 | -- | ||
39 | 1.7.9.5 | ||
40 | |||
diff --git a/meta/recipes-core/busybox/busybox_1.22.1.bb b/meta/recipes-core/busybox/busybox_1.22.1.bb index ffc9435398..782752c2aa 100644 --- a/meta/recipes-core/busybox/busybox_1.22.1.bb +++ b/meta/recipes-core/busybox/busybox_1.22.1.bb | |||
@@ -27,6 +27,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
27 | file://inetd.conf \ | 27 | file://inetd.conf \ |
28 | file://inetd \ | 28 | file://inetd \ |
29 | file://login-utilities.cfg \ | 29 | file://login-utilities.cfg \ |
30 | file://0001-build-system-Specify-nostldlib-when-linking-to-.o-fi.patch \ | ||
30 | " | 31 | " |
31 | 32 | ||
32 | SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e" | 33 | SRC_URI[tarball.md5sum] = "337d1a15ab1cb1d4ed423168b1eb7d7e" |