pxcloud/pkg-fetch
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

pass options from --runtime in any case. from bakery only if found

Browse Source
This commit is contained in:
Igor Klopov 2016-09-22 20:08:23 +03:00
parent 25f7607e2c
commit af31376cbc
3 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
patches/node.v0.12.15.patch
View File

@ -328,7 +328,7 @@
} // namespace node
--- node/src/node_main.cc
+++ node/src/node_main.cc
@@ -19,10 +19,147 @@
@@ -19,10 +19,144 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
@ -423,13 +423,10 @@
+int reorder(int argc, char** argv) {
+ int i;
+ int runtime_pos = argc;
+ char* bakery = (char*) ReadBakery(argv[0]);
+ if (!bakery) {
+ for (i = 1; i < argc; i++) {
+ if (strcmp(argv[i], OPTION_RUNTIME) == 0) {
+ runtime_pos = i;
+ break;
+ }
+ for (i = 1; i < argc; i++) {
+ if (strcmp(argv[i], OPTION_RUNTIME) == 0) {
+ runtime_pos = i;
+ break;
+ }
+ }
+ int entrypoint_pos = -1;
@ -440,6 +437,7 @@
+ }
+ }
+ char** nargv = new char*[argc + 64];
+ char* bakery = (char*) ReadBakery(argv[0]);
+ int c = 0;
+ nargv[c++] = argv[0];
+ if (bakery) {
@ -449,10 +447,9 @@
+ nargv[c++] = bakery;
+ bakery += width + 1;
+ }
+ } else {
+ for (i = runtime_pos + 1; i < argc; i++) {
+ nargv[c++] = argv[i];
+ }
+ }
+ for (i = runtime_pos + 1; i < argc; i++) {
+ nargv[c++] = argv[i];
+ }
+ if (entrypoint_pos != -1) {
+ nargv[c++] = argv[entrypoint_pos];

21
patches/node.v4.5.0.patch
View File

@ -393,7 +393,7 @@
} // namespace node
--- node/src/node_main.cc
+++ node/src/node_main.cc
@@ -1,7 +1,144 @@
@@ -1,7 +1,141 @@
#include "node.h"
+#include <string.h>
@ -485,13 +485,10 @@
+int reorder(int argc, char** argv) {
+ int i;
+ int runtime_pos = argc;
+ char* bakery = (char*) ReadBakery(argv[0]);
+ if (!bakery) {
+ for (i = 1; i < argc; i++) {
+ if (strcmp(argv[i], OPTION_RUNTIME) == 0) {
+ runtime_pos = i;
+ break;
+ }
+ for (i = 1; i < argc; i++) {
+ if (strcmp(argv[i], OPTION_RUNTIME) == 0) {
+ runtime_pos = i;
+ break;
+ }
+ }
+ int entrypoint_pos = -1;
@ -502,6 +499,7 @@
+ }
+ }
+ char** nargv = new char*[argc + 64];
+ char* bakery = (char*) ReadBakery(argv[0]);
+ int c = 0;
+ nargv[c++] = argv[0];
+ if (bakery) {
@ -511,10 +509,9 @@
+ nargv[c++] = bakery;
+ bakery += width + 1;
+ }
+ } else {
+ for (i = runtime_pos + 1; i < argc; i++) {
+ nargv[c++] = argv[i];
+ }
+ }
+ for (i = runtime_pos + 1; i < argc; i++) {
+ nargv[c++] = argv[i];
+ }
+ if (entrypoint_pos != -1) {
+ nargv[c++] = argv[entrypoint_pos];

21
patches/node.v6.5.0.patch
View File

@ -405,7 +405,7 @@
} // namespace node
--- node/src/node_main.cc
+++ node/src/node_main.cc
@@ -1,7 +1,144 @@
@@ -1,7 +1,141 @@
#include "node.h"
+#include <string.h>
@ -497,13 +497,10 @@
+int reorder(int argc, char** argv) {
+ int i;
+ int runtime_pos = argc;
+ char* bakery = (char*) ReadBakery(argv[0]);
+ if (!bakery) {
+ for (i = 1; i < argc; i++) {
+ if (strcmp(argv[i], OPTION_RUNTIME) == 0) {
+ runtime_pos = i;
+ break;
+ }
+ for (i = 1; i < argc; i++) {
+ if (strcmp(argv[i], OPTION_RUNTIME) == 0) {
+ runtime_pos = i;
+ break;
+ }
+ }
+ int entrypoint_pos = -1;
@ -514,6 +511,7 @@
+ }
+ }
+ char** nargv = new char*[argc + 64];
+ char* bakery = (char*) ReadBakery(argv[0]);
+ int c = 0;
+ nargv[c++] = argv[0];
+ if (bakery) {
@ -523,10 +521,9 @@
+ nargv[c++] = bakery;
+ bakery += width + 1;
+ }
+ } else {
+ for (i = runtime_pos + 1; i < argc; i++) {
+ nargv[c++] = argv[i];
+ }
+ }
+ for (i = runtime_pos + 1; i < argc; i++) {
+ nargv[c++] = argv[i];
+ }
+ if (entrypoint_pos != -1) {
+ nargv[c++] = argv[entrypoint_pos];