Commit graph

328 commits

Author SHA1 Message Date
Bjoern Michaelsen
276ba69ad2 no need for INPATH in WORKDIR anymore
* this has been obsoleted with commit 22d9caecc978a5739ddd1430fd26abe06454726c
2011-07-25 12:54:51 +02:00
Tor Lillqvist
76a27e577e Use fixed-name environment script and no source_soenv.sh
No longer call the script snippet LinuxX86Env.Set.sh,
MacOSXX86Env.Set.sh, etc, but always Env.Host.sh. No need for
source_soenv.sh then, which wouldn't have worked when cross-compiling
anyway.

(As before, when cross-compiling, the environment script snipppet for
the BUILD platform is called Env.Build.sh.)
2011-07-25 00:47:41 +03:00
Tor Lillqvist
15d5273c29 Bin pointless "nmake=dmake" alias, who needs that? 2011-07-25 00:27:11 +03:00
Bjoern Michaelsen
ae83b24660 Merge branch 'master' into feature/gnumake4 2011-07-24 19:22:58 +02:00
Bjoern Michaelsen
2819345cee bump workdir up a few levels 2011-07-23 15:59:33 +02:00
Caolán McNamara
d1f6403c9e ENABLE_DEBUG_STL isn't working out for us, too easy to mix with and without 2011-07-22 11:28:03 +01:00
Tor Lillqvist
3d12239031 Using -L/lib and -L/usr/lib on MacOSX builds is unnecessary and wrong
As we build against the MacOSX 10.4 SDK we should certainly not link
against any libraries of the build OS, which could well be 10.5, 10.6
or 10.7.

Norbert verified that this works fine.
2011-07-21 22:20:05 +03:00
Bjoern Michaelsen
5012e466ce resyncing to master 2011-07-21 18:27:57 +02:00
Tor Lillqvist
649a3a4181 Propagate DISABLE_ACTIVEX also in the WNTGCC case 2011-07-21 17:43:39 +03:00
Matúš Kukan
6f0156d40c revert some mismerges in set_soenv.in 2011-07-21 10:38:18 +02:00
Mike Eberdt
fe6dcc2e1b accept x86_64 for FreeBSD as well 2011-07-12 09:08:37 +01:00
Tor Lillqvist
3f086957df Don't use -L /usr/lib when building for iOS 2011-07-09 13:37:20 +03:00
Tor Lillqvist
7c46fa4494 Most likely pointless to pass -I $COMPATH/include when using gcc
Surely gcc finds its default header location anyway.
2011-07-03 16:47:19 +03:00
Caolán McNamara
e214780d71 fix stray define 2011-06-30 11:32:27 +01:00
Caolán McNamara
4e674ab45b make cairo an unconditional requirement for text rendering 2011-06-30 11:32:27 +01:00
Tor Lillqvist
bb4e01086c Don't use FLIPCMD when cross-compiling from Unix 2011-06-23 01:46:11 +03:00
Caolán McNamara
9574f268a8 add FONTCONFIG_[LIBS|CFLAGS] 2011-06-22 12:43:33 +01:00
Tor Lillqvist
67e1946064 Disable ATL when compiling with MinGW 2011-06-21 00:40:19 +03:00
Bjoern Michaelsen
81a1c065fd Merge branch 'master' into feature/gnumake4
Conflicts:
	Repository.mk
	RepositoryFixes.mk
	configure
	configure.in
	set_soenv.in
	solenv/config/sdev300.ini
	solenv/gbuild/ComponentTarget.mk
	solenv/gbuild/CppunitTest.mk
	solenv/gbuild/CustomTarget.mk
	solenv/gbuild/Deliver.mk
	solenv/gbuild/Executable.mk
	solenv/gbuild/JavaClassSet.mk
	solenv/gbuild/Library.mk
	solenv/gbuild/LinkTarget.mk
	solenv/gbuild/StaticLibrary.mk
	solenv/gbuild/TargetLocations.mk
	solenv/gbuild/gbuild.mk
	solenv/gbuild/platform/linux.mk
	solenv/gbuild/platform/macosx.mk
	solenv/gbuild/platform/solaris.mk
	solenv/gbuild/platform/windows.mk
	solenv/gbuild/platform/winmingw.mk
	solenv/gbuild/templates/Executable.mk
	solenv/gbuild/templates/Library.mk
	solenv/inc/libs.mk
	solenv/inc/unxobsd.mk
2011-06-19 11:36:52 +02:00
David Tardon
510737a54a enable libstdc++'s debug mode with --enable-debug 2011-06-18 17:20:10 +02:00
Tor Lillqvist
e17aac891e Temporary hack can be binned now 2011-06-18 16:51:32 +03:00
Michael Stahl
b2fab435e6 gnumake4: set_soenv.in: do not generate tcsh environment file [hg:7ac1d3e8f1fa] 2011-06-17 18:20:52 +02:00
Michael Stahl
00610e27d1 gnumake4: #i117687#: do not source *Env.Set.sh in bootstrap [hg:3c81abff5843] 2011-06-17 18:17:20 +02:00
Philipp Lohmann [pl]
54c611fa45 ooo340fixes: #i117804# differentiate between ENABLE_CAIRO and ENABLE_CAIRO_CANVAS [hg:e09be3339384] 2011-06-17 13:51:41 +02:00
Jan Holesovsky
e3d5d7185d Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
	Makefile.in
	bootstrap.1
	configure.in
	solenv/inc/minor.mk
2011-06-17 13:44:18 +02:00
Jan Holesovsky
d75defa37f Make the online update service configurable (via --enable-online-update).
Signed-off-by: Petr Mladek <pmladek@suse.cz>
2011-06-17 11:45:12 +02:00
Robert Nagy
ba62ce46c8 only fetch external tarballs if --disable-fetch-external is not defined 2011-06-15 12:55:51 +02:00
Robert Nagy
6fdc8ae0d1 only fetch external tarballs if --disable-fetch-external is not defined 2011-06-15 12:51:41 +02:00
Michael Meeks
fc328a31e8 first cut of gtk3 auto-detection, and autoconf-foo 2011-06-14 12:28:52 +01:00
Tor Lillqvist
5f92c3275a Add FOR_BUILD variant of SYSTEM_LIBXSLT and use it to decide which xsltproc to run 2011-06-14 00:53:34 +03:00
Tor Lillqvist
0957430c12 Don't use undefined variable 2011-06-10 00:46:15 +03:00
Tor Lillqvist
e59b18c6ec Propagate also SYSBASE to the build environment 2011-06-09 23:17:34 +03:00
Tor Lillqvist
354f25c64a Compare CROSS_COMPILING explicitly to YES 2011-06-08 11:46:06 +03:00
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
85822219bc use $GNUMAKE to print the build instructions 2011-05-23 09:25:00 +02: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