Commit Graph

49 Commits

Author SHA1 Message Date
70b36c6ab0 enable-debug for orcus based on ENABLE_DEBUG
Change-Id: I8f677bc57ab3c70e60f7708cc020526d4bb71043
2013-05-29 22:05:02 +02:00
6874228b09 Different, less intrusive fix for the boostsystem goodness
Change-Id: Icab27a0a8195f5a0fb81a51c4609dfb93036343d
2013-05-24 14:47:11 +02:00
cdabc886f6 Revert "Rename Boost libraries when built internally to match conventions"
This reverts commit 3aeecc525c76797801e9e2b24c2ebff6ac81adac.
2013-05-24 14:46:28 +02:00
3aeecc525c Rename Boost libraries when built internally to match conventions
The standard Boost convention is for them to be called libboost_date_time and
libboost_system (with apropriate suffix then depending on type).

Did not touch the libboostthread library we build for Windows.

Add the ax_boost_thread.m4 file for completeness and possible use.

Document where the ax_boost*.m4 files come from.

Change-Id: Ib49bee71398d62c9760a1f8fd5c46be9f3400430
2013-05-24 15:03:45 +03:00
503b248127 Update bundled boost to 1.53.0
Modify our patches as necessary to match the updated boost sources. Drop
patches for which corresponding (or even identical) changes already are
present. Add a new boostsystem static library and use it in two places.

Change-Id: Ib59558feb56dab87a69c91b38caca8e7a9e9a22e
2013-05-24 12:40:46 +03:00
3c38b7727a zlib: remove ExternalPackage_zlib
Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
2013-05-08 23:34:26 +02:00
1a1f1fbdf0 gbuild: ExternalProject: remove second parameter again...
... now that everything is consistent.

Change-Id: I96c15159648815554280202eb1b6d274ead4e7b8
2013-05-07 01:41:26 +02:00
10fc13c948 lib*: consistently name all UnpackedTarball and ExternalProject
Change-Id: I4d11dc634c4f93ffcdc7e1f359e5d6a0d001aaae
2013-05-07 01:41:26 +02:00
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
5f668959c5 make liborcus build on platforms that need PTHREAD_LIBS
Change-Id: Ied274511193eba9373072f1bc0636fe7f8a52b02
2013-04-26 17:32:22 +01:00
d4324078c4 No _GLIBCXX_DEBUG for iOS here, either
Change-Id: Ib21df33799f8a2ef552d8ecdf7f6fa9b82e1a178
2013-04-19 01:11:17 +03:00
dfebe3fc51 Revert _GLIBCXX_DEBUG on Mac OS X again
It does not work, see
<http://lists.freedesktop.org/archives/libreoffice/2013-April/050321.html> "Re:
[ANN] --enable-dbgutil: everyone gets a Debug STL!"

Change-Id: I0b0c0faa03a1a03095b70454d38a1a193b42d56a
2013-04-18 08:38:06 +02:00
b1e023ab7f Use -D_GLIBCXX_FULLY_DYNAMIC_STRING here, too, when needed
See d98c6b21420b30ae8419c3d4225bf2ce293ee39a for details.

Change-Id: I3faa87bae5a943ea60399a939742cffbbfeb5e37
2013-04-16 11:19:43 +03:00
935ccf0fb5 Use -D_GLIBCXX_DEBUG for iOS, too
Also, for clarity, sort the list of platforms for which it is needed
(those where we use the GNU C++ library).

Change-Id: I55463f248ee08f97c085610d72fa688657ba36e6
2013-04-15 22:59:11 +03:00
a5a5104cae gbuild: --enable-dbgutil: enable STL assertions for Mac OS X
Works here with Apple llvm-g++ 4.2.1; cannot run "subsequentcheck"
due to remote login.

Change-Id: I187620b65f82095b5e9b7433c01ede429a27c719
2013-04-15 15:26:33 +02:00
fac06b7a92 Revert "Go back to using Visual Studio project files to build"
I could not get it to build using the project files and VS2012...

With one additional patch to drop the use of dllimport in env.hpp, the
"gcc-wrapper" way builds fine for me, using VS2012.

It is not necessary to specify the dllimport attribute for functions
imported from a DLL. Specifying dllimport if the library actually is a
static library (as it is here) leads to linking errors.

The way the ifdefs and -D options were set up here, the utility and/or
test programs that are built as part of the liborcus build were
compiled using dllimport, and thus failed to link. So just don't
bother with dllimport.

This reverts commit 58b4cd934fd28b796dc12590f33971dd32ec95ee.

Change-Id: I2ffc90d47ae018a9a14b1c6d07fb0a225ce10d6d
2013-04-15 14:37:38 +03:00
9521532741 fix liborcus w/ system boost
Change-Id: Ia461382ffc2025d7fdf368ad68a258aa626ad59a
2013-04-13 20:17:42 -04:00
5c07874471 Fix copy/paste error in 173214d92046b4ea11f6c0959ca40999d1e0bbd2
Change-Id: I47a3f6ef639c9103b8def0dd029fcb6efec4b085
2013-04-13 17:13:40 +03:00
173214d920 Fix liborcus build for Android
Also hopefully make the environment variable setting on the configure commmand
line saner and working as intended for all platforms where relevant.

It doesn't work to set and append to an environment variable in one same
command like CPPFLAGS=something CPPFLAGS+=more ./configure ...

Change-Id: Ifb3fb6748d59388124b9987a1db3cab15ebaf757
2013-04-13 16:27:19 +03:00
9f7ac9aeeb Get cppunit in sc to link with orcus-parser.
Change-Id: I1f53a4f4b9beee501e29149ed88e3ce5d63d9a3c
2013-04-13 01:54:42 -04:00
1c82446d38 Let's see if this works for Visual Studio 2010....
Change-Id: I80b0dc6f36f798e06aad2221760b6b36d1a7f82b
2013-04-13 01:54:42 -04:00
58b4cd934f Go back to using Visual Studio project files to build.
gcc-wrapper is too smart for me to figure out.

Change-Id: Ia36255035ac0be8ddc6cfc26dac06f3cd1310769
2013-04-13 01:54:42 -04:00
0af23aaf69 Trying to fix Windows build. Still broken.
Change-Id: I4d5764d9fd8f03e61c99d5f5597314deefc3ffd5
2013-04-13 01:54:42 -04:00
f4f455c888 Deliver another library, though sc still can't link to it. Damn.
Change-Id: I6a0193df0cdb82e1855c5ac2d38976c7fb29d039
2013-04-13 01:54:41 -04:00
a2fa2edb7e Fix linker error against system zlib.
Not sure what we'll have to do with the internal zlib.  Not tested
that scenario yet.

Change-Id: Iec9e4f30b006ceaa2271156650b5ad922d4b40e4
2013-04-13 01:54:40 -04:00
f14e7094f8 Update the internal liborcus package to 0.5.0.
Change-Id: Ib0070ad8509ba4084a8b0871fbc8c24b550433d7
2013-04-13 01:54:40 -04:00
cc8e169d6c liborcus depends on zlib
...at least unless configured --without-gnumeric-filter, see its configure.ac:
"The gnumeric import filter depends on zLib."

Change-Id: Ied3fb0119978ed484c5e0668cd6a949b448e1ee0
2013-03-22 10:06:55 +01:00
82c4b9491a move liborcus to gcc-wrapper
Change-Id: I9d3ba7b142ec230d11af59f9eb21d203b0473dc8
2013-03-16 14:09:27 -04:00
d79bdca7e4 fix build on android with gcc 4.7
See https://code.google.com/p/android/issues/detail?id=41770

Change-Id: I555c1e9b8b15afd78b07b1c7b12a0b37d1112f9a
2013-03-02 13:01:04 -05:00
fa387a548e Add informative comment and revert unneeded (?) change
Surely if we need to use -D_GLIBCXX_HAS_GTHREADS on Android we should do that
somehow globally then and not just here in liborcus? But I haven't seen any
compilation errors caused by a lack of that? (Except, if memory serves me
right, for the Android on MIPS platform, but I haven't tried building that for
ages.)

And anyway, setting CPPFLAGS to one value in the environment for configure and
passing a CPPFLAGS setting on the configure command line (in the
--enable-dbgutil case) surely is pointless.

This reverts 84374b2d4c44a5c81277ebc18eadd632cd8497b5

Change-Id: I2a280bb24dc0a557c825070866e1969c3176fc3f
2013-03-01 11:21:11 +02:00
84374b2d4c fix boost threading on android
see https://code.google.com/p/android/issues/detail?id=41770

Change-Id: Ia6a016afcf3215558ae261e4844b69dec338d566
2013-02-28 19:59:23 -05:00
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
be9bf4801b Improve support for --with-system-boost --with-boost=... in external modules
...though it would arguably be better to just pass along --with-boost=... where
applicable.  (liborcus' orcus-xml-dump links against -lboost_system, so needs
BOOST_LDFLAGS passed in in addition to BOOST_CPPFLAGS.)

Change-Id: I6467d0f453d68494b75559a7eb61f865f9513b50
2013-02-17 11:57:50 +01:00
a53586f4ef gbuild: do not copy boost headers around
- do not use gb_UnpackedTarball_copy_header_files for boost
- adapt the optimization in concat-deps.c for new path
- use boost_headers in all LinkTargets that require it
- add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus

Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9
2013-01-26 22:20:06 +01:00
5c19504b50 Make MSBuild actually run the 2012 compiler when that is what we use
The /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 options are
needed to indicate that we want that. Otherwise MSBuild, when
presented with a .vcxproj file created by VS2010, will assume it is
the 2010 compiler that should be used. This will then lead to link
errors pointing outthe incompatibility when linking the static
liborcus into the scfilt DLL.
2012-12-14 00:19:55 +02:00
355cbe5ca5 Add VS2010 project, avoids unreliable vcupgrade 2012-12-13 18:12:31 +02:00
07f5a7c8ab liborcus: must be built with -D_GLIBCXX_DEBUG for debug STL
... in --enable-dbgutil mode.

Change-Id: I095bc8f29570afd9912a615e98ef05e4249ea8f7
2012-11-28 22:42:55 +01:00
3f662c726d Get it to build on Windows with liborcus gnumeric bits enabled.
Now scfilt must statically link zlib because gnumeric uses gzip
compression.

Change-Id: I79c527d381d3c2f9bccdf091ff2b0799efee4700
2012-11-28 10:01:30 -05:00
736200cdbb get orcus to build on RHEL-5
Change-Id: Ic18aa0eb1b48d57db81acd0d3d38ed33e3d71534
2012-11-28 14:20:54 +00:00
cdb6eca477 liborcus needs boost
Change-Id: I83c6bd1bfb44e74b9f659a970b5c32d7475addfb
2012-11-10 08:57:06 -05:00
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
b5c0e66bb9 fixing VS 2010 error: OutDir property must end with a trailing slash
Change-Id: Ic6477adbd8e8eaa24f851befe5d18d34061e88ce
Reviewed-on: https://gerrit.libreoffice.org/905
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
2012-10-24 19:42:06 +00:00
747ecb8fc8 fix liborcus with Visual studio 2008
Change-Id: Ia19669878e1a6c4d4b079355dcb7ce3e2836d24f
2012-10-08 11:30:59 +02:00
a97fdbda6b fix liborcus build with VS2012
Change-Id: I98248b2fe45da32fc0f478aee55b6939825112f7
2012-10-07 10:42:19 +02:00
90fc5593a4 Revert "Pass also gb_CXXFLAGS to the liborcus configury"
Causes way too much problems with the tinderboxes, thanks to -Werror
getting passed to the liborcus configury, and liborcus apparently is
quite -Werror-unclean.

Thus also revert the initial fixes for those WaEs. (Many more would be
needed, it seems. I rather leave it to Kohei to make upstream liborcus
warning-free.

This reverts commit 083fa89dd8f894f9cd0ef217a900fab777db9f2a.
This reverts commit 7e871bbaf7b208dd884528259211385b8074da39.
This reverts commit 21b5706f83edecad8cd3d0ab3ce5110b82e75a46.
This reverts commit bed5557e8bdfe5c698a45a4cc82619a7c22de001.
2012-09-20 10:26:24 +03:00
083fa89dd8 Pass also gb_CXXFLAGS to the liborcus configury
Fixes its build with Xcode 3 against the 10.4 SDK, at least for me...

Change-Id: Icaa792286477212cc3734c3fe02c9c1496d2e1f1
2012-09-20 08:30:16 +03:00
e7d85cc078 orcus: use Package to deliver libraries
Manually copied files aren't cleaned

Change-Id: I35b08ed6f10b9405d569c06c624d0702f1f6e5fa
2012-09-11 17:00:14 +02:00
c83d82e71b fix few problems with gbuildized liborcus
Change-Id: Ic8717085f0f71470eadc225eb062c1dee24d24f7
2012-09-11 15:44:43 +02:00
1ee760335b liborcus: convert to gbuild
Change-Id: I6a0d869526ffd40bfe5ff81267f241c049d050f0
2012-09-11 14:34:55 +02:00