Age | Commit message (Collapse) | Author | Files | Lines |
|
They break installation
|
|
|
|
|
|
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)?
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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.
|
|
install to %libdir% intead of %prefix% as it is usual for other projects;
use the usual DESTDIR instead of OODESTDIR
Note that the default installation path is /usr/local/lib/libreoffice;
it can be redefined by --prefix, --libdir, --with-install-dirname
configure options
Some of these changes contributed by Petr Mladek <pmladek@suse.cz>
|
|
|
|
|
|
|
|
|
|
* make id: create GNU idutils symbol lookup index
* make tags: create ctags index file (c++, java, html)
* make docs: create doxygen-style documentation below docs/
|
|
|
|
Using /bin/sh, this breaks on NetBSD (not even dmake is built).
|
|
|
|
|
|
|
|
You can use it like 'make install', or 'make install prefix=/path', to override
what has been set by ./configure.
|
|
|
|
Rather than relying on the sourced environment variables, create
Makefile with the correct dev-install target folder during the
./configure run. Slightly prettified the file.
|
|
fetch_tarballs is called by bootstrap when DO_FETCH_EXTERNAL is set to
true. So calling this here another time does not yield any benefit.
You could see this was happening, because it checked for wget and
mdsum twice at the beginning of each build.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
To be able handle the amount of jobs in the Makefile.
|
|
|
|
|
|
They are generated; so actually also add autogen.sh and Makefile.am to help
to generate them :-)
* Makefile.in: Bin.
* aclocal.m4: Bin.
* configure: Bin.
* autogen.sh: New file.
* Makefile.am: New file.
|
|
2009-01-19 15:47:39 +0100 rene r266508 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@266428 (milestone: DEV300:m39)
2009-01-18 00:35:31 +0100 rene r266462 : #i10000# Mac OS X "of course" has other paths...
2009-01-16 13:24:23 +0100 rene r266415 : make OS2 use STLport...
2009-01-15 22:08:38 +0100 rene r266393 : STLport for FreeBSD
2009-01-15 01:23:51 +0100 rene r266333 : #i98048# harmonize STL default; default to *NOT* use STLport
2009-01-09 22:44:43 +0100 rene r266120 : #i97428# try to find out XLIB via pkg-config
2009-01-09 22:41:18 +0100 rene r266119 : #i97827# fail when we don't find make
2008-12-27 01:19:34 +0100 rene r265812 : add make (dis)clean; force /bin/sh as we source *Enc.Set.sh
2008-12-27 01:16:31 +0100 rene r265811 : fix makefile.rc for config.*/config_office move
2008-12-26 22:37:54 +0100 rene r265810 : #i91641# in some cases, we also need the -Xbootclasspath at the second javac call
2008-12-26 17:55:11 +0100 rene r265806 : actually commit Makefile.in
2008-12-25 19:24:24 +0100 rene r265803 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@265758 (milestone: DEV300:m38)
2008-12-10 22:51:06 +0100 rene r265232 : #i96912# revert, cws swffixes02 has the right fix
2008-12-08 18:47:10 +0100 rene r265014 : xulrunner has no /plugin or /nspr
2008-12-08 17:51:28 +0100 rene r265013 : i96912# fix --with-system-mozilla
2008-12-05 13:05:55 +0100 rene r264903 : #i95339#
2008-12-04 17:53:53 +0100 rene r264865 : fix merge error
#i80238# add help for --with-epm
2008-12-04 17:44:28 +0100 rene r264864 : #i91641# fix build with JDKs already including a version of rhino which conflicts with our ancient one
2008-12-04 17:40:48 +0100 rene r264863 : i93429# check for sanity for expand.exe
2008-12-04 17:34:20 +0100 rene r264862 : config_office changes from m33 to m37
2008-12-04 17:28:55 +0100 rene r264861 : CWS-TOOLING: rebase CWS configuretoplevel to trunk@264807 (milestone: DEV300:m37)
2008-12-04 16:49:03 +0100 rene r264856 : fix cws. part 5
2008-12-04 16:45:06 +0100 rene r264855 : fix cws, part 4
2008-12-04 16:01:49 +0100 rene r264850 : fix cws, part 3
2008-12-04 15:14:12 +0100 rene r264848 : fix cws, part 2
|