Age | Commit message (Collapse) | Author |
|
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
|
|
ENABLE_CAIRO_CANVAS [hg:e09be3339384]
|
|
|
|
[hg:e37d17b6d8d9]
|
|
|
|
|
|
|
|
|
|
to run
|
|
This reverts commit cd4784c4d7466027801736f13bf06b08f6beacf6.
|
|
|
|
Cairo has no font backend suitable for Android anyway. So no use
building librsvg or the other 3rd-party libs that just librsvg needs
then either.
|
|
|
|
|
|
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.
|
|
It was introduced with the merge of OOo dev300_m106 branch and serves
no useful purpose.
Standard ./configure --prefix= does the same thing.
|
|
|
|
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)?
|
|
|
|
also remove the then unused PKG_CHECK_MODULES_MACHACK wrapper
|
|
|
|
|
|
|
|
|
|
Who would that surprise anyway?
|
|
|
|
|
|
We want to be buildable on Mac OS X without pkg-config. For instance
Mono installs a symlink /usr/bin/pkg-config that just confuses this
goal if you happen to build LibreOffice on a machine with Mono
installed.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
Also, add instsetoo_native to the ignore list.
|
|
Just list the OSes for which there is no "system" installed GLib etc
in one case in the case statement. Add iOS to the set.
|
|
|
|
|
|
|
|
At least, I think we do... So simplify the tests for it.
|
|
Use --with-system-librsvg also to direct whether to use the system
version of the libraries only used below librsvg (gdk-pixbuf, GLib,
libcroco, Pango, libgsf, I think).
There still is confusing overlap with older tests for librsvg, libpng
and libjpeg, which previously have ben relevant only on Unix
builds. This needs to be unified. Also, the new stuff that came with
the librsvg thing in m106 doesn't seem to use pkg-config, huh?
Reverse the sense of the messages for the new checks; instead of
saying "checking whether to build own version of libfoo... no", say
"checking whether to use system libfoo... yes". This matches the sense
of the corresponding SYSTEM_FOO variables, thus reducing confusion.
|
|
|
|
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
|
|
Must be used when cross-compiling the bundled ICU. Will then be
forwarded to the ICU configury as its --with-cross-build switch.
|
|
The configury in the bundled obsolete version of OpenSSL is just too
horrible to even bother patching up to work for cross-compiling to
iOS. There are several ways to build OpenSSL for iOS described on the
net, let's just use one of them.
|
|
|