[Lazarus] SVN update conflicts

[Mattias Gaertner]

Hans-Peter Diettrich <DrDiettrich1 at aol.com> hat am 22. März 2012 um 11:47
geschrieben:

> Mattias Gaertner schrieb:
>
> >> How do you suppose that something compiled on a 64 bit Linux/gtk2
> >> machine shall be used on a 32 bit Windows machine?
> >
> > Via cross compiling.
>
> Please stop kidding :-(


Sorry, but as you know the above case does not exist for the Lazarus
binaries, so I thought you were making this up.
As you know the Makefile.compiled is independent of
widgetset/targetos/targetcpu.





>
> How do the contributors to the repository know about *my* machine?
>
> > Have you looked into a Makefile.compiled file?
>
> Yes, and obviously these have been altered by a local "make" or other
> operation. E.g. my Makefile.compiled and .fpc contains "-dDoDi", so that
> both SVN and "make" are fooled when the versioned file contains
> different information about the compiled files. This became obvious only
> when SVN could not merge the local and remote versions of some of these
> auto-generated files.


As you know, the Makefile/Makefile.fpc/Makefile.compiled must be updated in
sync and that it requires the newest fpc to update, because only that knows
all targets. And that's why the auto update is disabled in all lpk of the
Lazarus sources. The Makefiles are manually updated by the Lazarus
developers - of course via the IDE/lazbuild.
Maybe some lpk files have a bug and the auto update is enabled.
Or maybe you updated them by accident.
The Makefiles are updated very seldom, so your update may be a year old.
Which lpk was wrong?




Mattias
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lazarus-ide.org/pipermail/lazarus/attachments/20120322/e4893994/attachment-0003.html>