<html><head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<p>Alright, I was able to move forwards. I removed the
opensmalltalk-vm tree with the Cog branch and then cloned the repo
again with the fix_include_order branch specified:</p>
<blockquote>
<p>rabbit@ganymede:~/vm-dev$ git clone -b fix_include_order
<a class="moz-txt-link-freetext" href="https://github.com/OpenSmalltalk/opensmalltalk-vm.git">https://github.com/OpenSmalltalk/opensmalltalk-vm.git</a></p>
</blockquote>
<p>I was able to compile RSErasurePlugin, reporting with many
errors. I will start a new thread, on these issues.<br/>
</p>
<div class="moz-signature">---<br/>
Kindly,<br/>
Robert<br/>
<br/>
<br/>
</div>
<div class="moz-cite-prefix">On 5/29/21 11:23 AM, Tobias Pape wrote:<br/>
</div>
<blockquote type="cite" cite="mid:DC7BE19F-E89E-435B-AC9D-22CE157B4DF8@gmx.de">
<pre class="moz-quote-pre" wrap="">
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">On 29. May 2021, at 17:20, Robert Withers <a class="moz-txt-link-rfc2396E" href="mailto:robert.withers@pm.me"><robert.withers@pm.me></a> wrote:
Hi Tobias,
Any progress on updating the fix_include_order branch? I have poked
around with git and my local repo is all messed up with conflicts. I do
not know how to dump all those merge attempts and be back at the HEAD of
Cog. But also, you stated I need the fix_include_order branch to build
on Linux. I want to build my plugins and test them!
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">Sorry, nothing much I can do :(
-t
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">---
Kindly,
Robert
On 5/27/21 2:43 PM, Tobias Pape wrote:
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">Hi
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">On 27. May 2021, at 20:34, Robert Withers <a class="moz-txt-link-rfc2396E" href="mailto:robert.withers@pm.me"><robert.withers@pm.me></a> wrote:
I tried and got a conflicts error. Unsure how to proceed.
rabbit@ganymede:~/vm-dev/opensmalltalk-vm$ git pull origin fix_include_order
From <a class="moz-txt-link-freetext" href="https://github.com/OpenSmalltalk/opensmalltalk-vm">https://github.com/OpenSmalltalk/opensmalltalk-vm</a>
* branch fix_include_order -> FETCH_HEAD
Auto-merging stacksrc/vm/interp.c
CONFLICT (content): Merge conflict in stacksrc/vm/interp.c
...
Auto-merging spur64src/vm/cointerp.c
CONFLICT (content): Merge conflict in spur64src/vm/cointerp.c
Automatic merge failed; fix conflicts and then commit the result.
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">Darn, that branch has to be updated -.-
Nicolas might have an idea tho…
Best regards
-tobias
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">---
Kindly,
Robert
On 5/27/21 2:12 PM, Tobias Pape wrote:
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">Also, try the
<a class="moz-txt-link-freetext" href="https://github.com/OpenSmalltalk/opensmalltalk-vm/tree/fix_include_order">https://github.com/OpenSmalltalk/opensmalltalk-vm/tree/fix_include_order</a>
branch for the time being.
Best regards
-tobias
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">On 27. May 2021, at 20:04, Levente Uzonyi <a class="moz-txt-link-rfc2396E" href="mailto:leves@caesar.elte.hu"><leves@caesar.elte.hu></a>
wrote:
The VM uses clang instead of gcc. So, you need to install clang.
Levente
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre class="moz-quote-pre" wrap=""></pre>
</blockquote>
<pre class="moz-quote-pre" wrap=""></pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">
</pre>
</blockquote>
</body></html>