package/buysbox: fix build with individual binaries
PATCH 1/1 package/buysbox: fix build with individual binaries
Fixes:
http://autobuild.buildroot.org/results/053/0539b3765eaa99029c4185ae89db6adb9e867078/
Kudos to Thomas for pinpointing the actual issue.
---
Peter, this is a candidate for 2019.02.x.
--- ...-mark-scripted_main-as-externally-visible.patch | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/busybox/0003-libbb-mark-scripted_main-as-externally-visible.patch
package/busybox/0003-libbb-mark-scripted_main-as-externally-visible.patch new file +53 -0
@@ -0,0 +1,53 @@ +From eb5830223d452944b96e526b2f44158bda5c5c56 Mon Sep 17 00:00:00 2001 +From: Ron Yorston <[email protected]> +Date: Sat, 30 Mar 2019 07:47:12 +0000 +Subject: [PATCH] libbb: mark scripted_main() as externally visible + +Building with individual binaries enabled fails when embedded +script applets are included: + + /tmp/ccIvMFZg.o: In function `main': + applet.c:(.text.main+0x20): undefined reference to `scripted_main' + +Mark scripted_main() as externally visible. + +Reported-by: Yann E. MORIN <[email protected]> +Signed-off-by: Ron Yorston <[email protected]> +Signed-off-by: "Yann E. MORIN" <[email protected]> +--- +Upstream status: reported, patch pending; + http://lists.busybox.net/pipermail/busybox/2019-March/087148.html + http://lists.busybox.net/pipermail/busybox/2019-March/087149.html +--- + include/libbb.h | 2 +- + libbb/appletlib.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/include/libbb.h b/include/libbb.h +index e0d5521e4..a20d5e403 100644 +--- a/include/libbb.h ++++ b/include/libbb.h +@@ -1347,7 +1347,7 @@ void bb_logenv_override(void) FAST_FUNC; + + /* Embedded script support */ + char *get_script_content(unsigned n) FAST_FUNC; +-int scripted_main(int argc, char** argv); ++int scripted_main(int argc, char** argv) MAIN_EXTERNALLY_VISIBLE; + + /* Applets which are useful from another applets */ + int bb_cat(char** argv) FAST_FUNC; +diff --git a/libbb/appletlib.c b/libbb/appletlib.c +index c15014a34..fa19e8488 100644 +--- a/libbb/appletlib.c ++++ b/libbb/appletlib.c +@@ -770,6 +770,7 @@ static int find_script_by_name(const char *name) + return -1; + } + ++int scripted_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE; + int scripted_main(int argc UNUSED_PARAM, char **argv) + { + int script = find_script_by_name(applet_name); +-- +2.14.1 +
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH 1/1 package/buysbox: fix build with individual binaries
Quoted 9 lines · On Sat, 30 Mar 2019 09:46:41 +0100 "Yann E. MORIN" <[email protected]>…
Fixes:
http://autobuild.buildroot.org/results/053/0539b3765eaa99029c4185ae89db6adb9e867078/Kudos to Thomas for pinpointing the actual issue.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Peter Korsgaard <[email protected]>
Quoted 6 lines
---
Peter, this is a candidate for 2019.02.x.--- ...-mark-scripted_main-as-externally-visible.patch | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/busybox/0003-libbb-mark-scripted_main-as-externally-visible.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/buysbox: fix build with individual binaries
In reply to Yann E. MORINQuoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Fixes:
http://autobuild.buildroot.org/results/053/0539b3765eaa99029c4185ae89db6adb9e867078/
Quoted 8 lines
Kudos to Thomas for pinpointing the actual issue.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>Cc Peter Korsgaard <[email protected]>---
Peter, this is a candidate for 2019.02.x.
Sure? This issue afaik got introduced by the bump to 1.30.1.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/buysbox: fix build with individual binaries
Peter, All,
On 2019-03-30 20:55 +0100, Peter Korsgaard spake thusly:
Quoted 6 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Fixes:
http://autobuild.buildroot.org/results/053/0539b3765eaa99029c4185ae89db6adb9e867078/---
Peter, this is a candidate for 2019.02.x.Sure? This issue afaik got introduced by the bump to 1.30.1.
Dang, I am pretty sure I did checkout 2019.02 before sending this, but it seems I failed somewhere... Indeed, it's only for master. Sorry...
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'