[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gcl-devel] progress compiling GCL with Wine
From: |
Camm Maguire |
Subject: |
Re: [Gcl-devel] progress compiling GCL with Wine |
Date: |
Wed, 30 Oct 2013 12:20:09 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) |
Greetings! Please try either (or preferably both, but singly) of the
following two patches:
=============================================================================
diff --git INDEX:/gcl/o/unixsys.c WORKDIR:/gcl/o/unixsys.c
index 03a9506..f178a9a 100755
--- INDEX:/gcl/o/unixsys.c
+++ WORKDIR:/gcl/o/unixsys.c
@@ -87,7 +87,7 @@ detect_wine() {
char b[4096];
struct stat ss;
- const char *s="/proc/self/status";
+ const char *s="/proc/self/statuss";
FILE *f;
object o;
=============================================================================
=============================================================================
diff --git INDEX:/gcl/o/unixsys.c WORKDIR:/gcl/o/unixsys.c
index 03a9506..f178a9a 100755
--- INDEX:/gcl/o/unixsys.c
+++ WORKDIR:/gcl/o/unixsys.c
@@ -108,7 +108,7 @@ detect_wine() {
massert(o!=Cnil);
mpid=getpid();
- massert(snprintf(b,sizeof(b),"%-.*smsys /tmp/ out%0d tmp%0d log%0d",
+ massert(snprintf(b,sizeof(b),"%-.*smsys.exe /tmp/ out%0d tmp%0d log%0d",
o->st.st_fillp,o->st.st_self,mpid,mpid,mpid)>0);
massert(!system(b));
diff --git INDEX:/gcl/unixport/makefile WORKDIR:/gcl/unixport/makefile
index deb6cee..13ca735 100644
--- INDEX:/gcl/unixport/makefile
+++ WORKDIR:/gcl/unixport/makefile
@@ -112,7 +112,7 @@ init_%.lsp: init_%.lsp.tmp
-e "address@hidden@#\"$(O2FLAGS)\"#1" \
-e "address@hidden@#\"address@hidden"#1" >$@
-saved_%:raw_% $(RSYM) init_%.lsp raw_%_map msys \
+saved_%:raw_% $(RSYM) init_%.lsp raw_%_map msys.exe \
$(CMPDIR)/gcl_cmpmain.lsp \
$(CMPDIR)/gcl_lfun_list.lsp \
$(CMPDIR)/gcl_cmpopt.lsp $(HDIR)/cmpinclude.h \
@@ -126,7 +126,7 @@ saved_%:raw_% $(RSYM) init_%.lsp raw_%_map msys \
$(RSYM): $(SPECIAL_RSYM) $(HDIR)/mdefs.h
$(CC) $(LD_FLAGS) $(CFLAGS) -I$(HDIR) -I$(ODIR) -o $(RSYM)
$(SPECIAL_RSYM)
-msys: msys.c
+msys.exe: msys.c
PATH=/usr/bin:$$PATH gcc $< -o $@ # Unix binary if running wine
$(HDIR)/mdefs.h: $(HDIR)/include.h
@@ -182,7 +182,7 @@ map_%:
clean:
rm -rf saved_*$(EXE) raw_*$(EXE) *.o core a.out $(RSYM) \
$(LSPDIR)/auto_new.lsp foo *maxima* init_*.lsp lib*.a gmp* bfd*
*.lsp.tmp \
- gazonk*.lsp plt*h *_map saved_* lib* raw_* msys out* log* tmp*
gcl.script
+ gazonk*.lsp plt*h *_map saved_* lib* raw_* msys.exe out* log*
tmp* gcl.script
.INTERMEDIATE: init_ansi_gcl.lsp.tmp init_gcl.lsp.tmp raw_gcl raw_ansi_gcl
.PRECIOUS: init_pre_gcl.lsp init_gcl.lsp init_ansi_gcl.lsp
=============================================================================
The first just disables msys, as my current wine version now appears to
be running gcc synchronously, so it may be obsolete. The second
attempts to see if the launch failure is merely due to a filename
extension.
Please let me know if problems persist.
Take care,
--
Camm Maguire address@hidden
==========================================================================
"The earth is but one country, and mankind its citizens." -- Baha'u'llah