Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Unified Diff: ports/busybox/nacl.patch

Issue 1418623008: Fix link error with busybox and glibc (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ports/busybox/defconfig ('k') | ports/busybox/pkg_info » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ports/busybox/nacl.patch
diff --git a/ports/busybox/nacl.patch b/ports/busybox/nacl.patch
deleted file mode 100644
index a86b9742f19af6ac91e171a55b4a9f825b32faec..0000000000000000000000000000000000000000
--- a/ports/busybox/nacl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/libbb/appletlib.c b/libbb/appletlib.c
---- a/libbb/appletlib.c
-+++ b/libbb/appletlib.c
-@@ -772,7 +772,10 @@ void FAST_FUNC run_applet_and_exit(const char *name, char **argv)
-
-
-
--#if ENABLE_BUILD_LIBBUSYBOX
-+#if defined(__native_client__)
-+#include "ppapi_simple/ps_main.h"
-+int nacl_ppapi_main(int argc UNUSED_PARAM, char **argv)
-+#elif ENABLE_BUILD_LIBBUSYBOX
- int lbb_main(char **argv)
- #else
- int main(int argc UNUSED_PARAM, char **argv)
-@@ -828,3 +831,7 @@ int main(int argc UNUSED_PARAM, char **argv)
- xfunc_die();
- #endif
- }
-+
-+#if defined(__native_client__)
-+PPAPI_SIMPLE_REGISTER_MAIN(nacl_ppapi_main)
-+#endif
« no previous file with comments | « ports/busybox/defconfig ('k') | ports/busybox/pkg_info » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698