From a6788ea337a2319a2d1a42ee4618553a1c7765bf Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Wed, 30 Oct 2013 17:56:37 +0100
Subject: ose: Fix various build environment issues

---
 erts/emulator/Makefile.in                  | 12 ++++++++++--
 erts/emulator/drivers/ose/ose_signal_drv.c |  5 +++++
 erts/emulator/sys/ose/erl_main.c           | 15 +++++++++++++++
 erts/emulator/sys/ose/sys.c                |  7 +++++++
 4 files changed, 37 insertions(+), 2 deletions(-)

(limited to 'erts/emulator')

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index 9935b911f6..63deae76d5 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -690,6 +690,14 @@ $(OBJDIR)/%.o: $(TTF_DIR)/%.c
 $(OBJDIR)/%.o: sys/$(ERLANG_OSTYPE)/%.c
 	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
+ifeq ($(findstring ose,$(TARGET)),ose)
+$(OBJDIR)/ose_confd.o: $(OSE_CONFD)
+	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+
+$(OBJDIR)/crt0_lm.o: $(CRT0_LM)
+	$(V_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
+endif
+
 $(OBJDIR)/%.o: sys/common/%.c
 	$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@
 
@@ -815,8 +823,8 @@ OS_OBJS = \
 	$(OBJDIR)/gzio.o \
 	$(OBJDIR)/elib_memmove.o
 
-OS_OBJS += $(OSEROOT)/src/ose_confd.o \
-	$(OSEROOT)/src/crt0_lm.o
+OS_OBJS += $(OBJDIR)/ose_confd.o \
+	$(OBJDIR)/crt0_lm.o
 
 OS_OBJS += $(OBJDIR)/sys_float.o \
 					 $(OBJDIR)/sys_time.o
diff --git a/erts/emulator/drivers/ose/ose_signal_drv.c b/erts/emulator/drivers/ose/ose_signal_drv.c
index acf09f748e..c1d861cc5a 100644
--- a/erts/emulator/drivers/ose/ose_signal_drv.c
+++ b/erts/emulator/drivers/ose/ose_signal_drv.c
@@ -28,7 +28,10 @@
 #include "sys.h"
 #include "erl_driver.h"
 #include "ose.h"
+
+#ifdef HAVE_OSE_SPI_H
 #include "ose_spi/ose_spi.h"
+#endif
 
 #define DEBUG_ATTACH   0
 #define DEBUG_HUNT     0
@@ -819,6 +822,7 @@ static ErlDrvSSizeT control(ErlDrvData driver_data, unsigned int cmd,
       return sizeof(PROCESS);
     }
 
+#ifdef HAVE_OSE_SPI_H
     case GET_NAME:
     {
       const PROCESS spid = get_u32(buf);
@@ -839,6 +843,7 @@ static ErlDrvSSizeT control(ErlDrvData driver_data, unsigned int cmd,
 
       return n;
     }
+#endif
     default:
     {
       /* Unknown command */
diff --git a/erts/emulator/sys/ose/erl_main.c b/erts/emulator/sys/ose/erl_main.c
index 322058c87b..a17fc7eabc 100644
--- a/erts/emulator/sys/ose/erl_main.c
+++ b/erts/emulator/sys/ose/erl_main.c
@@ -17,10 +17,25 @@
  * %CopyrightEnd%
  */
 
+#include <stdlib.h>
+
 int
 main(int argc, char **argv) {
 
+  /* When starting using pm_create -c ARGV="-- -root ..", argv[0] is the first
+     part of ARGV and not the name of the executable. So we shuffle some
+     pointers here to make erl_start happy. */
+  if (argv[0][0] == '-') {
+    int i;
+    char **tmp_argv = malloc(sizeof(char*)*(argc+1));
+    for (i = 0; i < argc; i++)
+      tmp_argv[i+1] = argv[i];
+    tmp_argv = "beam";
+    erl_start(argc,tmp_argv);
+    free(tmp_argv);
+  } else {
    erl_start(argc,argv);
+  }
 
    stop(current_process());
 
diff --git a/erts/emulator/sys/ose/sys.c b/erts/emulator/sys/ose/sys.c
index a8eb0b93b4..a8a99ceca6 100644
--- a/erts/emulator/sys/ose/sys.c
+++ b/erts/emulator/sys/ose/sys.c
@@ -852,6 +852,11 @@ OS_PROCESS(fd_reader_process) {
     }
 #endif
 
+    if (fd == 0) {
+      FILE *ffd = stdin;
+      (void)stdin;
+    }
+
     sigsel[1] = ERTS_SIGNAL_FD_DRV_ASYNC;
 
     read_buf = (byte *) erts_alloc(ERTS_ALC_T_SYS_READ_BUF,
@@ -909,8 +914,10 @@ OS_PROCESS(fd_writer_process) {
     /* Why do I need these?!? */
     if (fd == 1) {
       FILE* ffd = stdout;
+      (void)stdout;
     } else if (fd == 2) {
       FILE* ffd = stderr;
+      (void)stderr;
     }
 
     while (1) {
-- 
cgit v1.2.3