Commit Graph

1018 Commits

Author SHA1 Message Date
Luboš Luňák
38d7306d06 fix mingw openssl detection
broken in e3f607e766

Change-Id: I51fbadcc3565e9c070252834bab4130edb2dcce6
2013-04-15 17:06:49 +02:00
Michael Stahl
f14f7a2e45 MSVC: --enable-dbgutil uses debug runtimes
Works here with MSVC 2008, make check passes successfully.

Change-Id: Id02ab357ea93bddd241c7801c0d7b9b4be83b7b4
2013-04-15 15:26:32 +02:00
Michael Stahl
54ba172dc1 configure: find the MSVC debug runtime libraries
... and copy them to solver bin in "external"

Change-Id: I6850495d1abb848a3f6b17de6518d05890b13c32
2013-04-15 15:26:31 +02:00
Jan Holesovsky
6e6c8d18c6 Fix the gnutls test.
Change-Id: I3990e9fd073f06427dd86c690371011eb029b397
2013-04-15 13:23:02 +02:00
Thomas Arnhold
c32b6be06b fdo#60724 correct spelling
Change-Id: Ieb653adbd0cb4371ec5db57e70bcc551872f647f
2013-04-15 05:32:37 +02:00
Tor Lillqvist
7fbea47127 Change PLATFORMID, whatever it is, for iOS to "ios_arm"
Most likely PLATFORMID is not used for anything meaningful?

Change-Id: Ia303c81106597dd5ed1a5a56d51e79f04a1ead48
2013-04-14 01:16:11 +03:00
Tor Lillqvist
7ef070b461 Make SDKDIR match gb_Package_SDKDIRNAME for iOS
Change-Id: Ic453c5c4f5c584b63d7e74f02eb998861de21187
2013-04-14 01:16:10 +03:00
Andres Gomez
48d49759a4 neon: honor --disable-openssl and use GNUTLS
On --disable-openssl, the bundled neon library
will link against GNUTLS + gcrypt instead of
OpenSSL.

Change-Id: I5b3f09cd1003aefde0478aaab026536c962212c4
Reviewed-on: https://gerrit.libreoffice.org/3330
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-13 10:49:46 +00:00
Andres Gomez
f3f9db6d1d postgresql: honor --disable-openssl flag
On --disable-openssl, let's avoid linking the
bundled postgresql to OpenSSL by not passing down
--with-openssl to its configure script.

Also, configure stage will fail if krb5 or gssapi
are enabled as they need OpenSSL and, in any
case, --with-krb5 and --with-gssapi will not be
passed down to postgresql configure script.

Change-Id: Iaf7e944d1d8f6a018e949ece56f6d3881f1e8c46
Reviewed-on: https://gerrit.libreoffice.org/3333
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-13 10:48:54 +00:00
Andres Gomez
e3f607e766 build: new --disable-openssl flag
Most of the components included in LibreOffice
already support alternative TLS libraries (e.g.
NSS, GnuTLS).

Change-Id: If00c348046fdbc88156f3d89c25e874e7e9bd04c
Reviewed-on: https://gerrit.libreoffice.org/3328
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-13 10:47:27 +00:00
Andres Gomez
fd6d42395a build: warn when configure with --with-tls=openssl
When expliciting openssl as tls implementation to
use, show a warning as there are still some pieces
of code that may depend on NSS or GNUTLS.

Change-Id: I2cfaaf09b5ad83837928f2648975db956b261c19
Reviewed-on: https://gerrit.libreoffice.org/3327
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-04-13 10:47:05 +00:00
David Tardon
ea09e0352a add extra inc. dir for URE headers
This is in preparation for removing gb_ZipPackage. It is only a
temporary workaround, as the URE headers can be used directly from
$(SRCDIR), once we do the migration of public headers to top-level.
This commit should be reverted then.

Change-Id: I26b7ad6eb7b33797c174573e3c2f69d295408657
2013-04-13 09:26:18 +02:00
Kohei Yoshida
9dbf503b43 Now we require liborcus-0.6 package.
Change-Id: I05555e9bb7904d7b9c25842d76ebeea53a7c1dfd
2013-04-13 01:54:39 -04:00
Miklos Vajna
ac8461c628 configure: fix typo that enabled mergelibs by default
The commit message of 0e5f2ea0de71439fe121da47deaba68585541808? didn't
mention this, so I guess flipping over the default was just an accident.

Change-Id: I9078cc56a6064e3498b012848b860c7b414b37e6
2013-04-12 07:46:12 +02:00
Tor Lillqvist
873d2149f7 No point in even considering mergelibs for Android or iOS
Change-Id: I2b587946f094cd4e83f4148d6e3359452ec36bf6
2013-04-12 02:38:04 +03:00
Peter Foley
0e5f2ea0de create --enable-mergelibs=all option
Support cramming everything into one big merged library as well as
only the libraries depended upon by almost everything.

Change-Id: I69647037dc62840294ba670d5d6c172a4608bf3f
2013-04-11 19:00:12 -04:00
Matúš Kukan
3fdb77f082 add new urelibs library merging some libraries from ure/lib/
There is no configure switch for this, URELIBS must be set.

This commit changes strategy to link also libraries being merged.
We need them for build tools like idlc, cppumaker, .., so the tools can
link against them now. This avoids circular dependencies.

Change-Id: Ic49e18ecbeaff84d4f5a7fafe8b1fbf45ed18c9b
2013-04-10 22:52:56 +02:00
Caolán McNamara
0b05227203 detect IBM java paths on other platforms than x86
Change-Id: I3797c48951f5b95db7248122bd62c2b2ca2e3047
2013-04-10 16:25:33 +01:00
David Tardon
19d263f095 one variable to rule them all
one variable to find them,
one variable to deliver them all and into filelist put them,
in $INSTDIR where the installer searches.

Change-Id: I989f578f0ed6f9ef9167522249b36d95c15bfd1b
2013-04-10 17:05:44 +02:00
Miguel Gomez
4be242ce6b Allow selecting the tls backend to use in oox from configure
Change-Id: Ie82afb1f22caa0b02ddac256e2a0c2a49f19bb15
Reviewed-on: https://gerrit.libreoffice.org/3173
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
2013-04-10 08:36:51 +00:00
Tor Lillqvist
cdd1de0854 Check for the C++11 "final" specifier and introduce SAL_FINAL
I think it is useful to use SAL_FINAL mainly as a documentation aid,
to make it clear to a code reader when a class is not expected to be
derived from, and when a virtual function is not expected to be
overridden in a derived class.

Possibly there is also some class of bugs that using SAL_FINAL will
help find?

Change-Id: I45002f020dcb52e8a9f2962ff98780f2b80627af
2013-04-08 11:46:10 +03:00
Peter Foley
b97cade918 Supress warnings about unset classpath
I get the below warning for every single jar file without this patch.
warning: [options] bootstrap class path not set in conjunction with
-source 1.5
1 warning

Change-Id: I71c01aeea993640f1ec86fe1d8a977656861358d
2013-04-07 12:14:36 -04:00
David Tardon
bba6e9ebeb allow Package to install to other dir than $OUTDIR
This is preparatory work for creating installation directly by gbuild.

Change-Id: I1b11db37c76ff781731845650169f39cb78fe820
Reviewed-on: https://gerrit.libreoffice.org/3189
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-04-05 23:33:29 +00:00
Luboš Luňák
598d3228cd remove HAVE_SFINAE_ANONYMOUS_BROKEN
Since we no longer support the old Apple SDK using gcc-4.0.1, we can
remove the cruft to work around its problems. Woohoo.

Change-Id: Idf275e76449443f1f0314e75dab993f213a77eb7
2013-04-04 13:44:30 +02:00
Michael Stahl
5fccea4add unordf: replace external entity disabling handler code ...
... with a configure check for the fixed raptor library.

Change-Id: I495d5d28e9a4e7b6234f8f9d17c2bda36154316d
2013-04-03 22:53:37 +02:00
Tor Lillqvist
7aa6f1b014 Remove Mac OS X for PowerPC support
Change-Id: I10b15141e6a5f93365e1cfa6fbc0c7cc3ea49b15
2013-04-03 21:13:17 +03:00
Tor Lillqvist
d8842c2221 Remove Mac OS X 10.4 and 10.5 SDK support
Change-Id: Ib47f75f115f3410299890e775784b7c7bbc1316c
2013-04-03 21:13:05 +03:00
Thorsten Behrens
7885f9820d Make 10.6 sdk in XCode 4 setup work in configury.
Change-Id: Ia7393d177a24ec6d5e3c25e487a8d5ae96e3c02a
2013-04-03 13:36:47 +02:00
Thorsten Behrens
be21cd2bd2 Be more serious with our 10.6 baseline on OSX
Change-Id: Ic9e2970a29e387dc85972dc97a66e1dc47913a05
2013-04-03 12:48:54 +02:00
Michael Stahl
d719c01c2f Easter Bunny brings new redland tarballs
upgrade raptor to 2.0.9, rasqal to 0.9.30, redland to 1.0.16:
- new raptor depends on libxml2 version 2.6.27 and thus will _not_
  build against system libxml2 on Mac OS X 10.4/10.5
- stop delivering raptor-config/rasqal-config, set env vars instead
  (which unfortunately requires patching configures, TODO: upstream that)
- remove redundant configure flags
- stop passing -Wl,no-inhibit-exec (causes HP-UX code to be built on Linux)
- disable new rasqal build deps:
    --with-uuid-library=internal --with-digest-library=internal
- disable redland "libltdl" nonsense via --disable-modular
- fortunately openssl digest support has been removed too
- drop raptor-1.4.18.ooo_build.patch, set RAPTOR2_CFLAGS/LIBS instead
- drop raptor-1.4.18.autotools.patch:
  + FreeBSD parts moved to raptor-freebsd.patch.1
  + Android parts obsolete
  + don't know about the MinGW part (TODO)
- from drop raptor-1.4.18.mingw.patch dropped the part defining parsers
  to be built, done via --enable-parsers
- drop redland/raptor/raptor-1.4.18.cross.patch:
  the vsnprintf check is now done at runtime, and expat has been removed
- drop raptor-1.4.18.aix.patch,redland-1.0.8.aix.patch:
  presumably don't need special check for V7BETA since it's released now
- drop raptor-1.4.18.rindex.patch, index/rindex no longer used
- drop raptor-1.4.18.entities.patch, fixed upstream in 2.0.7
- drop raptor-1.4.18.fixes.patch, fixed upstream in 2.0.9
- drop raptor-1.4.18.{libxml,libxslt}.patch: TODO
- drop {raptor-1.4.18,rasqal-0.9.16,redland-1.0.8}.legal.patch:
  we don't care any more about Sun legal dept.
- drop rasqal-0.9.16.ooo_build.patch, set RASQAL_CFLAGS/LIBS instead
- drop rasqal-0.9.16.autotools.patch:
  + FreeBSD parts moved to rasqal-freebsd.patch.1
  + Android parts obsolete
  + MinGW part only for cygwin build
- drop redland-1.0.8.autotools.patch:
  + FreeBSD parts moved to redland-freebsd.patch.1
  + Android parts obsolete
  + don't know about the MinGW part (TODO)
- drop redland-1.0.8.ooo_build.patch,
  hopefully not necessary to disable utils build

Change-Id: I9cc44928ba87392d69e809abe2236cec0e4a508a
Reviewed-on: https://gerrit.libreoffice.org/3154
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-04-03 10:17:08 +00:00
Stephan Bergmann
9ab44f1273 Adapt AS_HELP_STRINGs
...to b7b3a90f5a "make gio the default instead of
crufty old gnome-vfs."

Change-Id: Ia6d250ec567f24d6bec3deb4a3d41a118b29b57d
2013-04-03 12:03:24 +02:00
Benedikt Morbach
fac49ace81 fdo#62110: GLU also needs -lGL to link
Change-Id: Ida9d03564cf003cae282792f0daf5945cff34108
2013-04-01 19:47:23 +02:00
Michael Stahl
70fcfeedca Revert "use -isystem instead of -I for 3rd party headers"
This reverts commit 151abb8b2b.

Unfortunately has the side effect that it will prevent GCC from
generating makefile dependencies for headers from bundled external
libraries, which breaks incremental builds horribly.
(Retain the uses in configure for real system headers).

Conflicts:
	RepositoryExternal.mk
	configure.ac

Change-Id: I149db1d402fa18bdc470f90dee846cfb5158237e
2013-04-01 13:01:16 +02:00
Peter Foley
ce9bf0f868 upgrade icu to 51.1
Change-Id: I1c0d5ca4b2f88ca48225fcdbeb978f27fa91f7a6
Reviewed-on: https://gerrit.libreoffice.org/2953
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Peter Foley <pefoley2@verizon.net>
2013-03-30 14:23:14 +00:00
Luboš Luňák
a51d6bf40f Revert "--enable-gio requires GVariant, which is >= 2.24"
It is actually only the shell/Library_losessioninstall.mk that requires
GVariant, and that one is Linux-only, all other GIO stuff is fine.
Which means now e.g. the ARM tinderbox fails. Revert, and either ignore
or wait for somebody to write a better check.

This reverts commit e511402738.
2013-03-29 14:58:27 +01:00
Luboš Luňák
e511402738 --enable-gio requires GVariant, which is >= 2.24
Change-Id: If9430ee2d0b92225cbd492f24598852b06f23079
2013-03-29 13:37:33 +01:00
Tor Lillqvist
62a7ad8deb Preserve timestamps of config_build/*.h, too, if unchanged
Change-Id: Ib2d6f3db0b4fa7d7558d82cdb464c8d707cd8f42
2013-03-29 11:07:12 +02:00
Bjoern Michaelsen
b7b3a90f5a make gio the default instead of crufty old gnome-vfs
- distro-config for Linux should stay fine as it is explict about
  gnome-vfs
- this makes e.g. a:
    sudo apt-get build-dep libreoffice
    ./autogen.sh
  work out of the box for Ubuntu Quantal

Change-Id: I5a85f7af80f798a683e5c92b329ed3d4fd250a1f
Reviewed-on: https://gerrit.libreoffice.org/3114
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Reviewed-by: Tomáš Chvátal <tchvatal@suse.cz>
Tested-by: Tomáš Chvátal <tchvatal@suse.cz>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2013-03-28 16:51:31 +00:00
Luboš Luňák
86461bd286 revert the --enable-clang option
This should be completely equivalent to ./autogen.sh CC=clang CXX=clang++ ,
which is the normal way to pass any compiler to configure, so this is needless
duplication.
This reverts commits 1a843cc54d and
02ed260819 .

Change-Id: Ib02ab84a7b84fe4797dca0f62aa5049c1be55302
2013-03-28 13:37:37 +01:00
Tor Lillqvist
2c38ea6d16 Building without --with-help is not supposed to disable help functionality
Drop HAVE_FEATURE_HELP. Just check HAVE_FEATURE_DESKTOP instead in the few
places in the code where HAVE_FEATURE_HELP had been introduced so far. It's
only for the non-desktop platforms that leaving out the traditional help
functionality is intended anyway.

Change-Id: I2d05869267f509a8e64cf402eed8ebef0020cada
2013-03-28 11:48:14 +02:00
Tor Lillqvist
aeb1c38c8c Do disable extensions for Android, too
I started running into mysterious trouble when some code still thought it
should be looking for extensions, although (perhaps) other code was not
willing to support such, or something. Some confusion caused by my recent
changes to make the conditional support of features more fine-grained.

Change-Id: I61758cb06054ceb038d200bc95615b5b85ed0f7b
2013-03-28 00:17:37 +02:00
Tor Lillqvist
ab7ac5884c Use <config_features.h> instead of -DDISABLE_EXTENSIONS
Change-Id: I4fe5cd27b77d44b9b33af0ae3c3754e3b85c2ca3
2013-03-27 13:02:22 +02:00
Tor Lillqvist
556fe2c612 Add config_features.h platform or configurable high-level features
Defines HAVE_FEATURE_{DESKTOP,HELP,MULTIUSER_ENVIRONMENT} for
now. Using <config_features.h> will supersede checking the
LIBO_FEATURE_DESKTOP and LIBO_FEATURE_HELP passed on the compilation
command-line.

Change-Id: I9866e2fd142f5c1a64c8f5c74452a20de23c66e3
2013-03-27 11:36:03 +02:00
Matúš Kukan
1e14293ef7 config_host.mk: L10N_MODULE is not used
Change-Id: Iab125e0e0dfac70d630d15301aba511150692f39
2013-03-27 00:40:10 +01:00
Julien Nabet
4a4b7abe46 Update commons-lang and commons-codec versions
Change-Id: I97b4ad2f2f671f8dc61e43836899d5532103ad9d
2013-03-26 21:50:16 +01:00
Peter Foley
4dd7010c00 don't build postgresql just to parse the makefiles
When running module-deps.pl postgresql gets built just so that
libpq-flags.mk can be included. Since we already have all the necessary
libraries, add them explicitly and avoid this.

Change-Id: Icd94fc215ecb26c95f9ae3c14625bf819bf3c5c3
2013-03-26 11:39:37 -04:00
Stephan Bergmann
bdb87236dc Fix pragma GCC diagnostic checks
Change-Id: I2967db165e3faed316628e5d538a1928474ece84
2013-03-25 15:04:31 +01:00
Michael Meeks
1a843cc54d band-aid fix for icecream regression
from commit: 02ed260819

Change-Id: If67b2166e8f12cf277f615721f030898232c4937
2013-03-25 10:28:53 +00:00
Mathias Michel
c98c94a868 Fix bashism in configure.ac
Change-Id: I574e873fede3343b2384715162dcecce86563db3
Reviewed-on: https://gerrit.libreoffice.org/2978
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
2013-03-25 08:55:00 +00:00
Stephan Bergmann
ede7627d24 Adapt pragma GCC diagnostic checks to GCC (did work well with Clang, though)
Change-Id: I6735505f83a1145bca3efeeee1e8c6ce33dac434
2013-03-25 09:23:00 +01:00