diff options
| author |   Eric Hameleers <alien@slackware.com> | 2018-05-23 20:07:57 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-23 20:07:57 +0000 |
| commit | 1fbac7e3910a7f21efeecea7af3d4dba1368a621 (patch) | |
| tree | b9e946d87ad9640d1354a835beaf4caf077b615b /libreoffice | |
| parent | 1712b9f6c58dc5ee09056529e89502edeff77060 (diff) | |
| download | asb-1fbac7e3910a7f21efeecea7af3d4dba1368a621.tar.gz asb-1fbac7e3910a7f21efeecea7af3d4dba1368a621.tar.xz | |
Initial revision
Diffstat (limited to 'libreoffice')
| -rw-r--r-- | libreoffice/build/patches/postgresql_openssl10.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libreoffice/build/patches/postgresql_openssl10.patch b/libreoffice/build/patches/postgresql_openssl10.patch new file mode 100644 index 00000000..c8fe9002 --- /dev/null +++ b/libreoffice/build/patches/postgresql_openssl10.patch @@ -0,0 +1,20 @@ +--- libreoffice-6.0.4.2/external/postgresql/ExternalProject_postgresql.mk.orig 2018-05-04 15:30:05.000000000 +0200 ++++ libreoffice-6.0.4.2/external/postgresql/ExternalProject_postgresql.mk 2018-05-11 21:38:27.158554784 +0200 +@@ -41,6 +41,9 @@ + ifeq ($(SYSTEM_OPENSSL),) + postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include + postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)/ ++else ++postgresql_CPPFLAGS += -I/usr/include/openssl-1.0 ++postgresql_LDFLAGS += -L/usr/lib@LIBDIRSUFFIX@/openssl-1.0/ + endif + endif + +@@ -66,6 +69,7 @@ + $(if $(WITH_GSSAPI),--with-gssapi)) \ + CPPFLAGS="$(postgresql_CPPFLAGS)" \ + LDFLAGS="$(postgresql_LDFLAGS)" \ ++ LIBS="$(postgresql_LDFLAGS)" \ + EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4" \ + && cd src/interfaces/libpq \ + && MAKEFLAGS= && $(MAKE) all-static-lib) |