Building on OS X

Building on OS X

[Timothy Larkin]

I have not been able to "make bootstrap" when building Emacs under Mac 
OS X 10.2.3, December 2002 developer tools.  All I get is

(cd src;      make  mostlyclean)
Makefile:66: *** missing separator.  Stop.
make: *** [bootstrap-clean-before] Error 2

This error persists even after trashing the entire emacs distribution 
and reloading it from Sourceforge.

Can anyone provide me with some insight on what this means or how I 
might fix it?

Many thanks,

Tim Larkin
Abstract Tools
Caroline, NY

Re: Building on OS X

[Kai Großjohann]

Timothy Larkin <tsl1@cornell.edu> writes:

> I have not been able to "make bootstrap" when building Emacs under Mac 
> OS X 10.2.3, December 2002 developer tools.

Did you run "./configure ..arguments.." first?

On the emacs-devel mailing list there was some discussion about
building on MacOS X failing with the most recent developer tools.  I
don't remember the outcome, but maybe the CVS repository has a fix
already.

AFAIK, the MacOS X code is in the main Emacs repository, so I'm
guessing that the copy on SourceForge might be old.

-- 
Do not be ashamed of ambibibentism.

Re: Building on OS X

[Hugo Wolf]

In article <8465tghj53.fsf@lucy.cs.uni-dortmund.de>, Kai Großjohann wrote:
> On the emacs-devel mailing list there was some discussion about
> building on MacOS X failing with the most recent developer tools.  

The problem reported by the OP has nothing to do with this issue.
Either some new bug has arisen in the cvs sources since 21-Dec or
whatever he encountered was the result of user error.



> I
> don't remember the outcome, but maybe the CVS repository has a fix
> already.

Doesn't look like it.  

The patch for this can be found in the usual place:

  http://members.shaw.ca/akochoi-emacs/


It's small enough to include here:

--- unexmacosx.c.~1.3.~	Mon Dec  2 09:22:04 2002
+++ unexmacosx.c	Sat Dec 21 21:44:48 2002
@@ -638,7 +638,8 @@
       else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
 	       || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
 	       || strncmp (sectp->sectname, "__dyld", 16) == 0
-	       || strncmp (sectp->sectname, "__const", 16) == 0)
+	       || strncmp (sectp->sectname, "__const", 16) == 0
+	       || strncmp (sectp->sectname, "__cfstring", 16) == 0)
 	{
 	  if (!unexec_copy (sectp->offset, old_file_offset, sectp->size))
 	    unexec_error ("cannot copy section %s", sectp->sectname);

Re: Building on OS X

[Timothy Larkin]

The problem has turned out to be the presence in 3 files of the lines

<<<<<<< darwin.h
=======
>>>>>>> 1.10

either in sequence or in close proximity.  Any idea why these lines 
should appear?  They appear, for instance, in <darwin.h>, and I know 
they are not legal C code.

Tim Larkin
Abstract Tools
Caroline, NY

Re: Building on OS X

[Raphaël Berbain]

Timothy Larkin wrote:

> The problem has turned out to be the presence in 3 files of the lines
>
> <<<<<<< darwin.h
> =======
> >>>>>>> 1.10
>
> either in sequence or in close proximity.  Any idea why these lines 
> should appear?  They appear, for instance, in <darwin.h>, and I know 
> they are not legal C code.

They should not appear - at least, they should never stay for a long
time.

I know nothing about OS X, Darwin, or the Emacs source code base.
However, this strongly looks like a cvs unresolved conflict.  The text
that appears between '<<<<<<< darwin.h' and '=======' is the version
that was in a local darwin.h file, while the text between '======='
and '>>>>>>> 1.10' is the version that was in the cvs repository when
the conflict occured.

So either you modified your local copy of darwin.h in a way that cvs
was unable to merge with the repository version, in which case you
should resolve the conflict locally (which often means choosing the
right portion, but can be much trickier - if you are in this case
though, chances are big that you are quite familiar with this portion
of the code), or somebody else made that conflict appear, and checked
it in the cvs repository by mistake - and then it appeared in your
local version when you cvs update'd.  In this case, cvs log and
history commands can help you find who did it so it can be resolved
with its help - look for changes between revisions 1.10 and 1.11.

-- 
Raphaël

Re: Building on OS X

[Rodney Sparapani]

When you update via CVS, collisions are marked with diff/patch-like syntax.
So, you just need to remove those files that are giving you trouble and do
another update.

-- 
Rodney Sparapani              Medical College of Wisconsin
Sr. Biostatistician           Patient Care & Outcomes Research
rsparapa@mcw.edu              http://www.mcw.edu/pcor
Was 'Name That Tune' rigged?  WWLD -- What Would Lombardi Do

Re: Building on OS X

[Kai Großjohann]

Timothy Larkin <tsl1@cornell.edu> writes:

> The problem has turned out to be the presence in 3 files of the lines
>
> <<<<<<< darwin.h
> =======
>>>>>>>> 1.10
>
> either in sequence or in close proximity.  Any idea why these lines 
> should appear?  They appear, for instance, in <darwin.h>, and I know 
> they are not legal C code.

They are CVS conflict markers.  This happens if you have locally
modified a file and it was also modified in the same region on the
server.

Use "cvs update -C" on the file to discard local changes.
-- 
Ambibibentists unite!