Commit graph

33 commits

Author SHA1 Message Date
Michael Stahl
e568d2ad00 fontconfig: don't use gb_ExternalProject_use_packages directly
Change-Id: I4ebe1a8caded065043db997e34d5d2b205fcca20
2013-10-01 10:39:55 +02:00
Tor Lillqvist
514414ca28 Fix up the expat dependency
Change-Id: I426779bbe0308a4e1c3bc567fe2ca67805d95e55
2013-09-30 10:51:27 +03:00
Norbert Thiebaud
523a1c00e1 enable binary package option for a set of 'stable' libraries
Change-Id: I8924ba22d178aa4d8e500ae3f484af654a37e87e
Reviewed-on: https://gerrit.libreoffice.org/4765
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>
2013-08-17 07:16:57 +00:00
Tor Lillqvist
18f5843183 C++11 requires a space between literal and identifier
Change-Id: I1f69b29a34efee5577e513282d32c52963793361
2013-07-30 10:20:05 +03:00
David Tardon
4eb68428f6 stop delivering fontconfig headers
Change-Id: Idb11e26ddf19c5424b838586dbd1d8d34a93cf23
2013-05-24 16:52:01 +02:00
Michael Stahl
5e037bbb3b expat: remove ExternalPackage_expat
Change-Id: I80b7f86947645a45263bbd7423a10ba8300441e9
2013-05-08 17:49:56 +02:00
Michael Stahl
1a1f1fbdf0 gbuild: ExternalProject: remove second parameter again...
... now that everything is consistent.

Change-Id: I96c15159648815554280202eb1b6d274ead4e7b8
2013-05-07 01:41:26 +02:00
Michael Stahl
276021c761 gbuild: remove gb_ExternalProject_use_unpacked
It must always be used exactly once, so replace it with constructor
parameter.

Change-Id: Ifbe87065c19a5185a5705dc461656179002ece5d
2013-05-07 01:41:25 +02:00
Michael Meeks
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
Michael Stahl
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
Norbert Thiebaud
ed26c01be1 quiet external module build log unless failure
ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Reviewed-on: https://gerrit.libreoffice.org/2304
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-22 08:25:56 +00:00
Tor Lillqvist
da2cdc885b The bundled expat is nowadays built as a single libexat
We now have a single libexpat instead of libascii_expat_xmlparse and
libexpat_xmltok. Hmm, no idea when that changed, but OK, that just simplifies
the fontconfig patch. (Note that the bundled fontconfig is used only for
Android.)

Change-Id: I3973d35a566bd3c86b013c96b7f3a6a8e249c2c0
2013-02-08 16:28:31 +02:00
Tor Lillqvist
b6c016da23 Use gb_VISIBILITY_FLAGS
Change-Id: I6be70c0b8d73f4d1d1428c0df94ea6d8bdc782f7
2012-11-19 12:26:44 +02:00
Michael Stahl
9c52986f26 Revert "Use different symbol names in the two expat variants we build"
This reverts commit 78c7bbc3ce.

It is no longer the case that both expat_utf8 and expat_utf16 are linked
into the same library: we only use expat_utf16 in shell Explorer
extensions, which cannot be linked into libmerged anyway.

Conflicts:
	expat/expat-2.1.0.patch

Change-Id: I579c10d405d8a40cafcb2dbe09e967c6079f7b16
2012-11-15 11:35:58 +01:00
Michael Stahl
e097ec36d7 tweak some build.lsts...
Change-Id: Ia9b5b2775ad91661bf3d130417a1624fa4d855d2
2012-11-15 11:35:57 +01:00
Tor Lillqvist
6063fd0402 fontconfig's configure looks for <expat.h>
So we need to use the expat subdir too in
--with-expat-includes. Apparently until now it did not find expat.h,
so it fell back to libxml2 instead then, which was sometimes found OK,
sometimes (on tinderboxes) not. (It even went looking in the *build*
platform /usr/include, eek!)

Change-Id: If0595b810d531b5aa7110f375d4d0dfb0b01617b
2012-11-08 16:09:49 +02:00
Michael Meeks
ed7d5822c0 cleanup README files.
Convert DOS -> unix newlines.
Cleanup and clarify several files.
2012-11-05 12:30:34 +00:00
Matúš Kukan
ed0b160041 fix parallelism variables and let's have only --with-parallelism from now on
Rationale:
- it is advised to use max-jobs and num-cpus with the same value in wiki
- max-jobs was used only for lcms2 and few gbuild
  modules outside of tail_build anyway.

Also fixes:
- really use CHECK_PARALLELISM when meant to
- EXTMAXPROCESS is not defined in gbuild;
  use parent's jobservers in sub-make where possible

Change-Id: I501de732d223ce0c935081bd1d73da611d16ee88
Reviewed-on: https://gerrit.libreoffice.org/930
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-30 20:34:03 +00:00
Tor Lillqvist
1f2c5dc6be Try to fix Android tinderbox build
For some reason $(LIBS) seems to contain a bunch of unneeded libraries
including -llo-bootstrap when we get here. Those won't be found by the
basic configury as there are no -L switches included, causing the
lovely "C compiler cannot create executables" problem.

Change-Id: Id7cfba191bd16649c7948194eb7ebdbfbfb74f3e
2012-10-30 14:06:52 +02:00
Tor Lillqvist
cbe020b979 Need -lm for Android for the exectuables that fontconfig builds
Said executables will not be used for anything, of course.

We can't use gb_STDLIBS, which also contains -lm after my previous
commit, as fontconfig is C, not C++, and gb_STDLIBS contains
-lgnustl_static, and only our $(CXX), not $(CC), contains the -L that
points to where -lgnustl_static is to be found.

Change-Id: I40c459580f357d913ddc55eae00e16f90f81d510
2012-10-29 14:28:26 +02:00
Matúš Kukan
526c9bdd04 fontconfig: convert to gbuild
Change-Id: Ia0ba9294e36c30147ed52826eac4b0059cfed200
2012-10-24 12:40:39 +02:00
Tor Lillqvist
451dddd056 Mention that these are used for Android only
Change-Id: Ie9ae6c2087dd6757ca22eabe2073e1f03a5489c8
2012-10-10 12:42:01 +03:00
Manal Alhassoun
0770b6cc20 add a README files
Change-Id: I2e779831e47cb1243ae7319b73b9fa553cf97034
Reviewed-on: https://gerrit.libreoffice.org/852
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
2012-10-10 09:00:51 +00:00
Tor Lillqvist
78c7bbc3ce Use different symbol names in the two expat variants we build
We need to be able to link both into one binary in the
disable-dynloading case.

Change-Id: I499e204dfef2af488d4a350cb3a5bcfc03ca887f
2012-10-03 20:26:25 +03:00
Tor Lillqvist
8b5cf7fb57 For kicks, enable cross-building for Android on MIPS
Change-Id: I6fa2b9a50c525fb2d8666a144409eb9a3ad2698a
2012-08-16 21:05:14 +03:00
Bjoern Michaelsen
b1c3e8ae28 make gbuild the default assumption of build.pl
this removes dmake completely out of the build for migrated modules
build.pl now assumes modules to be gbuild, unless there is a
prj/dmake file

Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
2012-04-29 03:50:46 +02:00
Tor Lillqvist
0d1c24e5f6 Build freetype and fontconfig statically for Android 2012-04-20 00:57:24 +03:00
Tor Lillqvist
a5aa747d59 Use -g in CFLAGS when debugging requested 2012-04-04 22:29:41 +03:00
Norbert Thiebaud
27bd5ff1fd keep the module name consistent in build.lst 2012-01-30 18:44:25 -06:00
Tor Lillqvist
201ade8770 Must use the "ascii" version of our expat build with fontconfig
Sigh, spent one day, more or less, tracking down a weird fontconfig
problem, where all the diagnostic it offered was "unknown encoding"
when reading the fonts.conf file.

It turned out that I was being screwed by our fun two versions of the
expat_xmlparse library: One where XML_Char is char and one where it is
short. The intuitively "more normally" named libexpat_xmlparse is the
latter, but fontconfig works only with the former as it implicitly
expects XML_Char to be char.
2012-01-13 01:31:44 +02:00
Tor Lillqvist
c8bab278bb Don't use soname, Android doesn't support that 2012-01-05 17:53:02 +02:00
Tor Lillqvist
5bd8284c9d Mark fontconfig as depending on expat 2011-12-16 08:42:21 +02:00
Tor Lillqvist
75aacd87bb Download and build FreeType and fontconfig for Android
It will probably be simplest to just use FreeType on Android,
too. (Android uses it itself, but doesn't provide its API publicly.)

Probably fontconfig, too, although there shouldn't be much
configuration per se that a LibreOffice-baed app would have to do at
run-time; it will have to bundle all fonts it is going to use anyway,
I think, so all font information is known a priori. But maybe in the
future there will be user-installable system fonts on Android, or
something.
2011-12-11 00:14:47 +02:00