summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openssl/UnpackedTarball_openssl.mk2
-rw-r--r--postgresql/postgresql-9.2.1-libreoffice.patch2
2 files changed, 3 insertions, 1 deletions
diff --git a/openssl/UnpackedTarball_openssl.mk b/openssl/UnpackedTarball_openssl.mk
index 86ba3e41593a..bb5e77115d21 100644
--- a/openssl/UnpackedTarball_openssl.mk
+++ b/openssl/UnpackedTarball_openssl.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
include/openssl/ec.h \
include/openssl/ecdh.h \
include/openssl/ecdsa.h \
+ include/openssl/engine.h \
include/openssl/err.h \
include/openssl/evp.h \
include/openssl/hmac.h \
@@ -57,6 +58,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
include/openssl/ssl23.h \
include/openssl/ssl3.h \
include/openssl/stack.h \
+ include/openssl/store.h \
include/openssl/symhacks.h \
include/openssl/tls1.h \
include/openssl/ui.h \
diff --git a/postgresql/postgresql-9.2.1-libreoffice.patch b/postgresql/postgresql-9.2.1-libreoffice.patch
index e1f1308a0c30..87d3da716644 100644
--- a/postgresql/postgresql-9.2.1-libreoffice.patch
+++ b/postgresql/postgresql-9.2.1-libreoffice.patch
@@ -84,7 +84,7 @@
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. /I "$(SSL_INC)" \
-+CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. $(SOLARINC) \
++CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. $(SOLARINC) /I $(WORKDIR)/UnpackedTarball/openssl/include \
/D "FRONTEND" $(DEBUGDEF) \
/D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" \
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \