Commit Graph

64 Commits

Author SHA1 Message Date
bf6d1f7742 Normalize DISABLE_OPENSSL to USE TRUE/<nothing>
Change-Id: I84dd99f42e032315fbf31332dfb62eb3ef4aa4c0
Reviewed-on: https://gerrit.libreoffice.org/5724
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-10-17 03:54:05 +00:00
1d633ca8dd postgresql: remove ExternalPackage
Change-Id: I8dadaf1f21bc16f6889a00a002c48cb3d93fbe01
2013-10-01 10:39:56 +02:00
ab74f61f80 postgresql: find libldap_r again
... so that's what the ldap_r was for that i removed in
f33c8644c052bf9d69157224500ca7887075c7da.

Change-Id: I8b913880fa32b2bf8566727af954a0ce0da4bba0
2013-09-23 19:32:02 +02:00
2f6261fa07 find lots of external static libraries in UnpackedTarball dir
Note: do NOT put file paths to static libraries into FOO_LIBS variables
that are passed to bundled externals that are built with --enable-static:
on Mac OS X this will result in .a archives that contain other .a
archives as entries, and trying to link those results in errors like:

ld: warning: ignoring file .../libodfgen-0.0.a, file was built for
archive which is not the architecture being linked (i386)

Change-Id: If2c5a458058e4da76f80b3643e55b489d1edee24
2013-09-22 11:08:33 +02:00
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
3c38b7727a zlib: remove ExternalPackage_zlib
Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
2013-05-08 23:34:26 +02:00
ee8323e228 postgresql: stop delivering headers
Change-Id: I1c08999207a90e6105fbba576354cbfea0ec1689
2013-05-08 17:49:57 +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
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
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
3326a85ae6 fix postgresql build
Change-Id: I379029dbf600769e415582aa7162f320e707c3da
2013-03-26 14:22:20 -04:00
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
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01: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
c97a46ad21 fix postgresql on win
Change-Id: I2c43441563cfb1237e6b2eaafe0acfaa5e952cde
2012-12-31 17:03:07 -05:00
9ddba66440 convert openssl to gbuild and add to tail_build
Change-Id: I52c62a91e317f072237cf25ed54f3cc6456d82b3
Reviewed-on: https://gerrit.libreoffice.org/1495
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-31 20:13:20 +00:00
e097ec36d7 tweak some build.lsts...
Change-Id: Ia9b5b2775ad91661bf3d130417a1624fa4d855d2
2012-11-15 11:35:57 +01:00
f3d2d9aaaf Upgrading postgresql to 9.2.1
Change-Id: If6e58db174159111dec9c6ab39258d757a3e6ba5
2012-11-13 17:12:31 +01:00
ed7d5822c0 cleanup README files.
Convert DOS -> unix newlines.
Cleanup and clarify several files.
2012-11-05 12:30:34 +00:00
4aed4f436c add a README files
Change-Id: I4bd9a7d00df220e2a3deae3cc1b7b0f4a1098e24
Reviewed-on: https://gerrit.libreoffice.org/989
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
2012-11-05 11:53:53 +00:00
30e6227c6f postgresql: forgot to change include path for openldap
Change-Id: I3ce3906662ff6ce5855e4c20c3d2f927288bec9f
2012-10-30 22:01:39 +01: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
c3a586a716 openldap: convert to gbuild
Change-Id: Ic1c4c58a09fd41bce78731e61349baa129f5e935
2012-10-28 15:16:19 +01:00
f9735c65aa fix postgresql on win
Change-Id: I15da34e09b74d9b97b64327ab46282c4f33e4118
2012-10-21 12:11:02 -04:00
ffcaa7651f convert postgresql to gbuild
Change-Id: Ia1345904a819d8edfad53c8882be35b398e8bc6e
2012-10-21 09:49:03 -04:00
aad94ec02c Fixing build with internal openldap
Change-Id: I365c5252a48b6ba4e8409534c75d34c4d07b2475
2012-07-16 17:22:49 +02:00
336c956262 First attempt at removing mozilla ldap at all (please help to fix)
Change-Id: I0559cf1820c782d22c4d75749f2171d7702b4e73
2012-07-16 17:22:49 +02:00
4bc7149816 Trying to use Windows LDAP for Windows builds
Change-Id: Ic06bda1393de4da05af01f79b8ba54cf0ee2cb73

Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
2012-07-09 09:44:37 +02:00
da7058c856 Revert "Fix Windows debug build."
This reverts commit db649c52911fd5b030a7e4e0c941d7ee75b98785.

I will patch the external postgresql library instead.
2012-05-04 08:47:35 +02:00
db649c5291 Fix Windows debug build.
The postgresql static library on Windows is named libpqd.lib in
debug and libpq.lib when compiled in release. We prefer to not
touch the external postgresql, so we make the proper changes in
the connectivity module.
2012-05-03 13:34:01 +02:00
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
ece70bbfec Silence silly MSVC "deprecation" warnings too 2012-02-10 14:04:43 +02:00
1c343fd6e3 Don't use the debugging CRT and different name when building LO for debugging 2012-02-10 14:04:12 +02:00
74cb90c9dc pgsql: MSVC build use MozLDAP headers only when using MozLDAP 2012-02-10 08:07:37 +01:00
f33038cf6a fix postgresql massive-parallel build 2012-02-06 15:21:53 +01:00
069fa157ce postgresql on MS Windows: use MozLDAP only if enabled 2012-02-05 12:05:31 +01:00
d8b5d22387 redo c16027de8423cdb6b33ce5f5f9e13fdc25b9dbeb cleaner
Also align our configure.in to the changes
Change source file (configure.in), not only generated file (configure)
2012-02-03 11:58:19 +01:00
c16027de84 Fix order in which postgresql searches for libs
...so that it does not miss any required libs due to picking up others first
that indirectly provide the required symbols; that would break our
libpq-flags.mk which should contain all the required libs when linking in the
static libpq.a.
2012-02-03 10:55:28 +01:00
165a5bea14 Fix build of postgresql module with mozilla ldap on WNTMSC 2012-01-31 11:08:06 +01:00
c7511d9802 Use --build and --host when cross-compiling
Just a start, I suspect the configure script here will fail anyway
when cross-compiling to Windows at least. And we surely won't even
bother trying cross-compile this to non-desktop OSes.
2012-01-24 10:58:09 +02:00
227350eb5a Introduce optional krb5&gssapi support for internal PostgreSQL
Enable it by default on MacOS X
2011-12-15 18:40:59 +01:00
7f2f963300 postgresql: separate patch into upstream & libreoffice-specific parts 2011-12-15 13:34:26 +01:00
f953f1b11a Simplify the patch
1) When building internal pgsql even on Windows, we use Mozilla LDAP if it is built
2) Regenerate the generated fils with autoconf-2.63 that is used by upstream
2011-12-13 09:19:02 +01:00
2282f4f3f2 Avoid double slashes in paths (cosmetic change only) 2011-12-13 09:19:01 +01:00
d1dacd144f Use SOLARINC and SOLARLIB instead of hand-crafted path 2011-12-13 09:19:01 +01:00
5438fef04f postgresql-sdbc: get libpq link deps from postgresql build system 2011-12-12 19:31:53 +01:00
914d1fc464 postgresql: go look for includes and libs in solver 2011-12-12 19:31:52 +01:00
f2f31cbd24 Complete the pgsql patch 2011-12-12 15:01:57 +01:00
8bfe0a7df1 Fix a thinko in makefile.mk 2011-12-12 14:20:14 +01:00