summaryrefslogtreecommitdiff
path: root/external/postgresql/UnpackedTarball_postgresql.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-06 17:20:37 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-07 13:24:58 +0100
commita01ac385ed16fbe4239938c9d31462691707e87b (patch)
treea9b6594657422b544b27d06ec9f7133d92d28957 /external/postgresql/UnpackedTarball_postgresql.mk
parentec1b227b435a555464cb2a9fe747631485ebdbf1 (diff)
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>
Diffstat (limited to 'external/postgresql/UnpackedTarball_postgresql.mk')
-rw-r--r--external/postgresql/UnpackedTarball_postgresql.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/external/postgresql/UnpackedTarball_postgresql.mk b/external/postgresql/UnpackedTarball_postgresql.mk
index 3ae5eed0746b..a7e57ab93301 100644
--- a/external/postgresql/UnpackedTarball_postgresql.mk
+++ b/external/postgresql/UnpackedTarball_postgresql.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,postgresql,3))
$(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
external/postgresql/postgresql-libs-leak.patch \
external/postgresql/postgresql-9.2.1-libreoffice.patch \
+ external/postgresql/windows.patch.0 \
))
ifeq ($(SYSTEM_ZLIB),)