The list of modules built in the cross-build-toolset target, many with
--all, is getting a bit unwieldy. Should do this in a cleaner way,
with a for loop, and avoiding multiple invokations of build.pl --all,
instead just figure oiut a clever way to get the definite list of
individual modules needed, in the correct order.
This reverts commit 77eb7f58d973eeb397dac0702646fc811894851c.
The original build problems were fixed in libs-core/sysui.
Signed-off-by: pmladek@suse.cz
It apparently doesn't have curl-config in
/Developer/SDKs/MacOSX10.4u.sdk/usr/bin, in fact no usr/bin in the
10.4 SDK at all. (The 10.4u SDK on Intel does have it.) Which is a bit
weird, I thought that SDK was supposed to be "universal" and the same
for both ppc and x86. But oh well, I will when necessary just set
CURLCONFIG in the environment when running configure then.
Hardcode use of the curl-config from the 10.4 SDK for MacOSX. Make use
of pkg-config to find libcurl when cross-compiling optional, if no
libcurl package found by pkg-config, use curl-config.
./g was doing 2 pair of git show-ref --head HEAD
to figure out if something had change... notwidthstanding that it is a
complete waste for the case of ./g clone, the only reason this was
done was to touch a ./clone/repos_changed file that used to be
used back in the 'build repo' days (pre 3.4)
binned that.
Like in my previous plan, when cross-compiling we run the same
configure script separately for a native build configuration on the
build platform, in a temporary subdirectory.
Now use a fixed name "CONF-FOR-BUILD" for that subdirectory, so that
it is easy to edit out that path component from those build
environment variables that contain it.
Pass more of the native build environment variables up to the main
configure and propagate those to the build environment suffixed with
_FOR_BUILD: INPATH, OUTPATH OUTDIR, PATH, SOLARINC, SOLARLIB,
WORKDIR. Whether these all will actually be needed remains to be seen,
the set can be reduced later.
The environment setting file (*Env.Set.sh) for the native build is
copied here to the top directory under the name Env.Build.sh, and the
environment variables set in it that contain pathnames are modified to
point directly to this top directory, not the temporary CONF-FOR-BUILD
subdirectory.
When doing a cross-compiling build, we first do a build of the
necessary build-time tools for the build platform. This is done in the
same source tree. As the directories where build results are stored
include the platform specification (OUTPATH or in some cases INPATH),
there should be no clashes.
Don't run the download script from ./bootstrap(.1). We are running it
from Makefile already anyway often enough. This could also do with
some clean-up; the ./g -f clone phase is a bit slow, I am not sure if
it really is necessary every time? Also, we should not overwrite
ooo.lst if its contents isn't changing.
Use INPATH_FOR_BUILD in SOLARBINDIR so that the self-built tools like
idlc that we run are for the build platform, not the host
platform.
Attempt to get rid of the makefile.rc and makefile.mk files. Surely it
should be enough with just Makefile(.in) (and then GNUmakefile.mk for
its own so far special gbuild purposes). Instead of invoking dmake to
do "clean" or "distclean" from Makefile(.in), we already just do the
same directly in Makefile(.in). This way we don't need to first build
dmake in order to be able to do a make clean, which will then finally
clean out dmake again;)
Ideally I would like to get rid of bootstrap(.1), too. It should be
possible to merge its tasks into configure(.in) or Makefile(.in) as
appropriate.
And actually, maybe also what set_soenv(.in) does could well be merged
into configure(.in)?
Drop the TARGETPLATFORM=BUILD indication of stuff that is to be built
for the build platform but pointless to build for the host platform. I
will handle the split of stuff built for the build or host platforms
differently. Note that some libraries need to be built for both
platforms.
Add explicit rules to do nothing for the cross-compilation case, but
likely even that will be unnecessary in the case of complete modules
like soltools (?). I will just mark modules that are for the build
platform only with an own flag in BUILD_TYPE.