Commit graph

294 commits

Author SHA1 Message Date
Fridrich Štrba
6f6d51d86c Allow system libvisio when asked nicely 2011-06-06 12:49:32 +02:00
Tor Lillqvist
aa961bb6ca Bin the --with-icu-native-build-root option 2011-06-05 01:24:52 +03:00
Tor Lillqvist
f206336a25 Rehash of cross-compilation ideas
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)?
2011-06-04 19:08:44 +03:00
Tor Lillqvist
4b93f8cdc7 Simplify zip and unzip checks 2011-06-02 02:40:32 +03:00
Tor Lillqvist
cf8989c140 Unify librsvg options into --enable-librsvg=no/auto/system/internal 2011-06-02 01:01:34 +03:00
Jan Holesovsky
6a29b48bf5 Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap 2011-05-31 10:46:15 +02:00
Jan Holesovsky
07c1d34ec7 Merge commit 'libreoffice-3.4.0.2'
Conflicts:
	configure.in
	distro-configs/LibreOfficeMacOSX.conf
	distro-configs/OxygenOfficeLinux.conf
	distro-configs/OxygenOfficeWin32.conf
	download
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	set_soenv.in
	solenv/bin/modules/installer/download.pm
	solenv/gbuild/CppunitTest.mk
	solenv/inc/minor.mk
	solenv/inc/settings.mk
2011-05-31 10:45:37 +02:00
Tor Lillqvist
a53ebd43ec No need to do anything with $HOME 2011-05-31 10:08:33 +03:00
Jan Holesovsky
e72584561e Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap 2011-05-27 20:49:08 +02:00
Jan Holesovsky
ca907e0220 Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
	Makefile.in
	Repository.mk
	autogen.sh
	bin/lo-commit-stat
	configure.in
	distro-configs/LibreOfficeOpenBSD.conf
	distro-configs/LibreOfficeWin32.conf
	instsetoo_native/util/openoffice.lst
	ooo.lst.in
	scp2/source/ooo/module_langpack.ulf
	set_soenv.in
	solenv/bin/ooinstall
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/unxgcc.mk
	solenv/gbuild/platform/windows.mk
	solenv/inc/minor.mk
	solenv/inc/settings.mk
	tail_build/prj/makefile.mk
2011-05-27 20:39:04 +02:00
Caolán McNamara
de6b387500 ENABLE_DIRETX->ENABLE_DIRECTX 2011-05-26 14:06:18 +01:00
Tor Lillqvist
f52905162f Add --with-icu-native-build-root switch
Must be used when cross-compiling the bundled ICU. Will then be
forwarded to the ICU configury as its --with-cross-build switch.
2011-05-26 02:55:45 +03:00
Tor Lillqvist
5d50561735 Use the build OS xsltproc when cross-compiling 2011-05-24 02:48:19 +03:00
Tor Lillqvist
6c28e9e143 Set SOLARLIB also for MinGW (cross-)compilation
Set it as on Cygwin, and with the -L flags in the same order as for
Linux &co for consistency.
2011-05-23 17:33:48 +03:00
Robert Nagy
8ce2d816a1 use $GNUMAKE to print the build instructions 2011-05-23 09:24:04 +02:00
Francois Tigeot
6dad9edb9e Use a single shell source file for all NetBSD platforms
Finish cleaning up INPATH and OUTPATH.
2011-05-22 10:29:41 +02:00
Francois Tigeot
255ba80655 Use the same OUTPATH on all NetBSD architectures 2011-05-22 10:04:20 +02:00
Tor Lillqvist
3f56e8f87c Java tweaks for cross-compilation 2011-05-21 02:45:18 +03:00
Tor Lillqvist
c761ef3d41 Export NSIS_PATH also in the MinGW cross-compiling case
Actually NSIS_PATH is crack, it is actually the *directory* where the
makensis program is located, so why not simply just have a variable
with the full pathname to that instead (or just the command name, in
case it is in the default PATH anyway, like on openSUSE with
/usr/bin/makensis)? That would simplify the stuff in download.pm, too.
2011-05-19 22:55:17 +03:00
Robert Nagy
333fb1d408 handle amd64 and x86_64 for OpenBSD the same way 2011-05-19 12:26:44 +02:00
Tor Lillqvist
89b361c0a4 More cross-compiling work and cleanup
Re-introduce the old --with-mingw option but now called
--with-mingw-cross-compiler. Its purpose is now specifically to give
the cross-compiler used when building the ODK, if Java is enabled, and
if building the unowinreg.dll. It has now nothing to do with
cross-compiling LibreOffice itself.

Correspondingly, the WITH_MINGW variable now has meaning only when
building LibreOffice for Windows: If using MinGW, whether natively on
Windows itself (which we as such don't intend to support, I hope), or
cross-compiling, it is set to "yes".

Automate and simplify the search for the MinGW cross-compiler when
intending to build unowinreg.dll on Unix.

Look for the usual tool-chain tools ar, nm, objdump, pkg-config,
ranlib, strip, and for Windows alto dlltool and windres using
AC_CHECK_TOOL so that the proper cross tools are found when
needed. Propagate to environment. As such these are not used except in
the MinGW mk files so far.

Other minor cleanups.
2011-05-18 18:56:58 +03:00
Tor Lillqvist
c9f99f4ec8 Rework how <db.h> is included 2011-05-18 11:13:43 +03:00
Tor Lillqvist
95760e349e MSVC followup fix for RC command line syntax 2011-05-18 03:19:02 +03:00
Tor Lillqvist
3d97229173 Make checks for db work when cross-compiling
When looking for the db,h header, use Autoconf mechanisms instead of
manual checks in hardcoded directories. So yeah, this means that you
need to make sure the correct -I flag is passed if you have db
installed in a weird place where the compiler doesn't find it.

Use checks that require only compiling, not running code. Nice.

Don't AC_SUBST variables that are not used.
2011-05-17 22:36:57 +03:00
Tor Lillqvist
84fbaed77d More cross-compiling work
AC_SUBST also EXEEXT_FOR_BUILD and use that in Makefile.in.

As winemv.set.sh is now called WindowsMSVCEnv.Set.sh, with capital E
and S like all the others, we can simplify the glob pattern for the
Set.sh file.

Don't attempt to download and/or run unpackers for dependencies
relevant only when using MSVC if using MinGW.

Misc other Windows host vs. build fixes.
2011-05-17 02:22:19 +03:00
Tor Lillqvist
85d44913ab Minor tweaks for cross-compiling
Still a long way from working, of course.

The configure script now runs to finish on Linux with --host=mingw32.

It is no longer an error if Windows SDK or DirectX SDK are not found
by the logic in the configure script. It might well be that the user
has included relevant -I and -L flags in CC or CXX that makes the
compilations work anyway, or something. We should not try to be too
clever and try to predict how the compiler or linker work in the
configure script.

We now define the FOO_FOR_BUILD environment variables in set_soenv.in
even when not cross-compiling (identically as the plain FOO ones in
that case, obviously). This should make some makefiles and stuff that
build tools to run on the build host a bit simpler.
2011-05-16 18:55:07 +03:00
Tor Lillqvist
699d119f78 Use current terminology and socket library
It's called the Windows SDK, not the Platform SDK. Link only with the
ws2_32 library, not the wsock32 one.
2011-05-16 16:01:30 +03:00
Tor Lillqvist
71c391a328 Set GUIBASE for Android 2011-05-16 00:51:42 +03:00
Tor Lillqvist
60dbfc13ee Use specific OS value for Android 2011-05-16 00:00:57 +03:00
Tor Lillqvist
30659f237f Initial baby steps for Android cross-compilation 2011-05-15 03:54:50 +03:00
Tor Lillqvist
89b315948c Rename the Windows env setting files to be in MixedCase, too 2011-05-15 03:54:48 +03:00
Tor Lillqvist
c552c7faf1 Fix from-scratch build breakage: Don't call realpath on Windows path
In a from-scratch build, when running the configure script, which then
runs the set_soenv script, the default_images symlink (that is passed
to this function in the form of a Windows path, for some reason) does
not exist yet, and realpath fails anyway. So don't bother calling
realpath on Windows paths.

Although I don't know whether it then will cause a problem that the
cygpath -m call won't be able to expand the symlink as it doesn't
exist anyway. This is a mess. And if cygpath -m expands symlinks
anyway, why is the realpath needed at all?
2011-05-15 03:41:58 +03:00
Tor Lillqvist
dc4d7d995b Kill obsolete STAR_FOO stuff 2011-05-15 00:37:04 +03:00
Tor Lillqvist
4c7f692682 Kill USE_NEW_SDK and adapt to it being always TRUE 2011-05-14 23:26:26 +03:00
Tor Lillqvist
a84c47186d Kill SET_EXCEPTIONS, not used anywhere as far as I could see 2011-05-14 23:14:05 +03:00
Tor Lillqvist
14a32cca5c Kill CDPATHx, not used anywhere as far as I could see 2011-05-14 23:04:24 +03:00
Tor Lillqvist
85373fe2e7 Kill BIG_SVX, not used anywhere as far as I could see 2011-05-14 22:55:09 +03:00
Tor Lillqvist
210fc3366a Kill build_deliver, not used anywhere as far as I could see 2011-05-14 22:43:13 +03:00
Tor Lillqvist
985bbdbc7d Kill "TF_FILTER"
No idea what it is, not used anywhere as far as I could see.
2011-05-14 22:40:25 +03:00
Tor Lillqvist
79173f64a1 Kill "NEW_JAR_PACK"
It was fixed as TRUE, so unconditionally change its uses according to
that.
2011-05-14 22:38:29 +03:00
Tor Lillqvist
6498fdaca7 Kill "BMP_WRITES_FLAG"
Not used anywhere as far as I can see.
2011-05-14 22:29:36 +03:00
Tor Lillqvist
4e011da922 Kill "BUILD_SOSL", some Hamburg thing 2011-05-14 22:02:30 +03:00
Tor Lillqvist
5f0b89e382 Kill "BUILD_SOSL_RELEASE"
No idea what it is, doesn't occur anywhere else in the sources.
2011-05-14 21:58:16 +03:00
Tor Lillqvist
2cba0cf4bc Kill "local solenv"
No idea in what circumstance one would want to use that.
2011-05-14 21:56:49 +03:00
Tor Lillqvist
025ca51745 Check more sizes and alignments and propagate to environment 2011-05-14 02:56:37 +03:00
Tor Lillqvist
a6e5ca0cc4 More cross-compiling work 2011-05-13 23:54:02 +03:00
Tor Lillqvist
414c15bbb2 Argh, it's just host, not host_alias 2011-05-13 20:36:31 +03:00
Tor Lillqvist
eaf8e0939a Some initial baby steps towards cross-compilation
And some baby steps for cross-compiling for iOS in particular.
2011-05-13 20:24:40 +03:00
Tor Lillqvist
11606530ee Use more meaningful option name
It's called the .NET Framework, so don't talk about "frame".

Also align Usage help printout better.
2011-05-13 15:07:54 +03:00
Kalman Szalai - KAMI
f36579d1af Fix oooblogger extension download mechanism
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2011-05-12 12:23:47 +02:00