Commit Graph
32 Commits
Author SHA1 Message Date
Xisco Fauli 2cfd5a8752 Fix ARM64 build after postgres upgrade to 13.8
Partially revert 096e2ba8e4
"postgresql: upgrade to release 13.8"

Change-Id: I3fa2a96f9765788ab6193133c4f420eed7eb99bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142255
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-11-04 08:27:27 +01:00
Taichi Haradaguchi 096e2ba8e4 postgresql: upgrade to release 13.8
Fixes CVE-2022-1552 and CVE-2022-2625.

Change-Id: I4964c43fefc94f12a16c45d8727ae41cf1ce278b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140458
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-09-23 11:35:22 +02:00
Jan-Marek Glogowski 4537886ec1 externals: always provide platform configure flags
No idea why we just provided the platform flags when cross-
compiling. In the curious case, where the host platform is
detected as x86_64-pc-mingw32 per default and we actually
want to override it with x86_64-pc-cygwin, we don't do a
cross compile, but must override the host platform.

But there is additional special handling needed for the omitted
cross-platform build in the special case of --host=i686-pc-cygwin
and --build=x86_64-pc-cygwin, where we deliberatly ignore cross
building; Windows is already a slow build, so try to keep this
optimization (AMD64 can execute x86 binaries).

There is the theoretical case, where the externals config.guess
would have detected something else and that "magically" even
worked, while the LO detected triplet would fail, but this
should be fixed in the external in any way.

Change-Id: Ib7a9719e0e406fe90334b7611dc3f01b51692bfa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129153
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2022-01-31 10:31:04 +01:00
Mike Kaganski 8e779c062a Centralize VS-to-toolset mapping in configure
This allows to define the mapping once, and avoid modification in
multiple places each time a new VS version support is added

Change-Id: I93de4c9d78c3f67a0a2e157007e9d13b6f557937
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123163
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-10-08 14:54:10 +02:00
Hossein c156a8c708 Add preliminary VS 2022 support
This patch changes the configure.ac, so that LibreOffice compiles
with the latest VS 2022 preview.

The option --with-visual-studio=2022 should be added to the
autogen.input, in order to use VS 2022 preview.

Change-Id: Ia1d9bbeabbbd44ffe82af3624151b69d36c0a45c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122133
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-09-16 19:50:56 +02:00
Jan-Marek Glogowski 8a4173987e WASM: add initial support for Emscripten cross build
- configure with:
- --host=wasm64-local-emscripten
- had to make a few externals optional, so adding:
  - --disable-nss
  - --disable-cmis
  - --disable-curl

Change-Id: I48d1c73d2675ad2e2beaf2c341578199efbd24ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111130
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-05-05 21:14:54 +02:00
Jan-Marek Glogowski 013ddc4f53 Switch OPENSSL config var from negative to positive
- align with most of the rest of config_host
- rename DISABLE_OPENSSL to ENABLE_OPENSSL
- make this configurable

Change-Id: Ic3b41fcdda38db66134939f12265e0da24833d60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114564
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-05-05 21:14:30 +02:00
Jan-Marek Glogowski 5e1b3e924a Rename LO Windows arm64 ID to aarch64
The Windows platform is called Arm64. But now that the ID for Mac
is also going to be renamed from arm64 to aarch64, this get's rid
of the arm64 as the UNO identifier and user in gbuild, just like
on all other Arm64 platforms.

Change-Id: I60a7eafd04b426f17b6e41ad9a09e6405c0d4173
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112973
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2021-03-23 23:46:12 +01:00
Thorsten Behrens db8fb941ec Fix ARM64 build after postgres upgrade to 13.1
Change-Id: I12bdda6aedd9b7b15423f997fe8c6910d9c9e9d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112464
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-03-14 18:29:58 +01:00
Michael Stahl bbc5cc71fd postgresql: try to cargo-cult MSBuild arguments
Extremely unclear to me whether these are useful or necessary,
but the other MSBuild ones have them.

Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-02-03 23:16:35 +01:00
Michael Stahl 234833f782 postgresql: upgrade to release 13.1
Fixes CVE-2020-25694, plus a bunch more CVE that don't look relevant.

* --with-krb5 no longer exists, neither does --disable-shared
* remove internal-zlib.patch.1:
  zlib is only used by pg_* tools / contrib/pgcrypto
* remove postgresql-libs-leak.patch:
  some relic from pre-gbuild times, not clear what the point is for
  static libs
* remove postgresql-9.2.1-libreoffice.patch:
  another dmake .mk file relic, and the win32 nmake build system was
  removed
* add postgres-msvc-build.patch.1 to fix Cygwin perl and openssl
* on WNT, libpq.dll is now built, no longer static lib

Change-Id: Ic0232a28801b2f604d9f4e33d5621ae3362defaa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109640
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-01-20 11:31:18 +01:00
Jan-Marek Glogowski 0911b0a263 openssl: update to 1.1.1g
The OpenSSL 1.1.1 release is currently the only supported version
and it already has the Windows Arm64 support I was looking for.

This change also explicitly enables thread support, which Python
depends on since release 3.7, which removed the --without-threads
build option. But the explicit OPENSSL_THREADS was just added in
3.8.4, so the old no-threads build fails now and was wrong since
probably much longer.

Change-Id: I61d94f966bc59407f213f4a81f0a49d0c05f8948
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98435
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2020-07-17 10:14:17 +02:00
Tor Lillqvist 5fe12dd54a Use correct location for the config.{guess,sub} in the postgresql tarball
Change-Id: Iccec53f67ab6c9e7920354f6a26c81300c1bee48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98097
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-07-05 20:34:50 +02:00
Tor Lillqvist 010713e65c Brown paper bag fix for e69f547bce
No idea why Jenkins didn't notice.

Change-Id: Iaab45f40ad97db3118373eb0d27fd57692f979ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96981
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-23 23:29:36 +02:00
Tor Lillqvist e69f547bce Fix -Werror,-Wimplicit-function-declaration in posrgresql configury
Change-Id: I3c2dfb94a3c9627e802956cc03cebcbdb7d498cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96912
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-23 17:26:35 +02:00
Luboš Luňák 0adc9b615f GBUILD_TRACE, support for finding out where the build time is spent
See instructions in solenv/gbuild/Trace.mk . This generates a file than
can be viewed e.g. in the Chromium tracing view.

Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-02-16 14:49:45 +01:00
Stephan Bergmann cfd06eb99b Pass LDFLAGS into external/postgresql
This will be needed when building against Flatpak org.freedesktop.Sdk//19.08,
which no longer bundles krb5, so we will have a bundled libgssapi_krb5.so
at /app/lib (instead of under /usr), but which requires LDFLAGS=-L/app/lib to
be found.

Change-Id: I8767740ab0cbb02b6ae682b7f0e21ec90ea5ddd7
Reviewed-on: https://gerrit.libreoffice.org/80620
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-11 06:31:30 +02:00
Andrew Udvare 6776c53b7c Make LDAP support optional
Change-Id: Ifbd3903494a81e7b155bf6468f6ca2c50b3370a4
Reviewed-on: https://gerrit.libreoffice.org/65958
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2019-02-10 07:56:14 +01:00
Stephan Bergmann a01ac385ed Upgrade external/postgresql to postgresql-9.2.24
...which is the latest 9.2.x currently listed at
<https://www.postgresql.org/ftp/source/>.  9.2.1 doesn't build against
OpenSSL 1.1 which dropped SSL_library_init (cf. <https://wiki.openssl.org/
index.php/Library_Initialization#libssl_Initialization>), and 9.2.24 apparently
has that covered.  (Ran into this when trying to upgrade the LibreOffice flatpak
build to org.freedesktop.Sdk//18.08, which has OpenSSL 1.1.)

On Windows, the new tarball as-is fails with

> ..\..\port\chklocale.c(214): error C2037: left of 'lc_codepage' specifies undefined struct/union '__crt_locale_data'

because at least in Windows Kits/10/Include/10.0.17763.0/ucrt/corecrt.h
(included from Windows Kits/10/Include/10.0.17763.0/ucrt/locale.h), the relevant
definitions are now

> typedef struct __crt_locale_data_public
> {
>       unsigned short const* _locale_pctype;
>     _Field_range_(1, 2) int _locale_mb_cur_max;
>                unsigned int _locale_lc_codepage;
> } __crt_locale_data_public;
>
> typedef struct __crt_locale_pointers
> {
>     struct __crt_locale_data*    locinfo;
>     struct __crt_multibyte_data* mbcinfo;
> } __crt_locale_pointers;
>
> typedef __crt_locale_pointers* _locale_t;

which presumably has changed from a past state where that lc_codepage member was
directly publicly accessible.

<https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2> is a copy of
<https://ftp.postgresql.org/pub/source/v9.2.24/postgresql-9.2.24.tar.bz2>;
`sha256sum postgresql-9.2.24.tar.bz2` reports the same
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126 as recorded in
<https://ftp.postgresql.org/pub/source/v9.2.24/postgresql-9.2.24.tar.bz2.sha256>

Change-Id: I196dd93aa03471042efba57ea639e1bb6655de98
Reviewed-on: https://gerrit.libreoffice.org/64730
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-07 13:24:58 +01:00
Stephan Bergmann 7c3c2ef49f Use gb_UnpackedTarball_update_autoconf_configs in external/postgresql
Change-Id: I56c68b74daa701e0e27ca4b661ece12bf20a8776
Reviewed-on: https://gerrit.libreoffice.org/64729
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-07 07:48:45 +01:00
Michael Stahl 4fcdc190af external: consistently use gb_ExternalProject_use_nmake
... instead of hard-coding some subset of the variables everywhere.

Change-Id: I5eac5663563ee9d6cb7b57f5f6e9d55560587276
Reviewed-on: https://gerrit.libreoffice.org/44167
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-11-01 19:52:53 +01:00
Stephan Bergmann 8646ab97dc Remove MinGW support
In OOo times, there'd originally been efforts to allow building on Windows with
MinGW.  Later, in LO times, this has been shifted to an attempt of cross-
compiling for Windows on Linux.  That attempt can be considered abandoned, and
the relevant code rotting.

Due to this heritage, there are now three kinds of MinGW-specific code in LO:

* Code from the original OOo native Windows effort that is no longer relevant
  for the LO cross-compilation effort, but has never been removed properly.

* Code from the original OOo native Windows effort that is re-purposed for the
  LO cross-compilation effort.

* Code that has been added specifially for the LO cross-compilation effort.

All three kinds of code are removed.

(An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing
--with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.)

Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568
Reviewed-on: https://gerrit.libreoffice.org/34127
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-10 18:01:27 +00:00
David Tardon 6287b17ce7 fix build of postgresql with bundled zlib
Change-Id: I8a1a8b8e1437d79d4c262cb8521a1239c250699e
2016-11-04 16:22:23 +01:00
David Tardon f595e426e3 cond. build is already handled in Module_external.mk
Change-Id: I5efe3bafc4f0b97578a75dc1f43e6c130a93bc4a
2016-10-23 20:13:21 +02:00
Michael Stahl ad40015ac4 normalize values of WITH_GSSAPI/WITH_KRB5
Change-Id: I72c67d5a4987f25ddfa21d93a89b0ceae40c9e81
2014-03-11 11:57:16 +01:00
Michael Stahl d729d169de normalize values of CROSS_COMPILING
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
2014-02-27 18:09:01 +01:00
Michael Stahl 5378deaea3 normalize values of SYSTEM_ODBC_HEADERS, SYSTEM_OPENLDAP
Change-Id: I913c38878a110625747fbf32ad9c43ad0dab30d3
2014-02-12 09:53:10 +01:00
Michael Stahl 5866b33bdd normalize values of SYSTEM_HSQLDB, SYSTEM_POSTGRESQL
Change-Id: Ia29a173ab6bb3442f98cd6db4db67ad27e7fa9a1
2014-02-12 09:53:10 +01:00
Michael Stahl e3abec3f07 fdo#74825: fix missing lcms2/libxslt/curl in installation sets
The assumption that all configure variables had been normalized to
TRUE/<empty> turned out not to hold; convert a bit more in that
direction.

(regression from 4af38b099c)

Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
2014-02-12 09:53:08 +01:00
Michael Stahl cca8c8cf79 nss: upgrade to 3.15.3
- from nss_macosx.patch drop nmedit hunk (removed upstream)
- adapt include and lib paths to changed tarball directory layout

Change-Id: Ia5dcce8dfd9d10e7e4ba689eefa9f39a51596dfe
Reviewed-on: https://gerrit.libreoffice.org/6670
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-14 11:27:38 +00:00
Michael Stahl eca3dec204 fdo#42783: remove CPU variable from environment
Replace uses with CPUNAME instead, and get rid of the horrible
postgresql patch that worked around environment leakage.

Change-Id: I38ccabfc438360524a272901bb9332ea708e274c
2013-11-07 01:34:43 +01:00
Khaled Hosny 547d2c7582 fdo#70393: move postgresql to a subdir of external
Change-Id: Ibd7c9a4db0150bdb115b061e21587ca964dc2c84
Reviewed-on: https://gerrit.libreoffice.org/6549
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-11-04 02:36:59 -06:00