mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix postgresql on win

Browse Source 
Change-Id: I2c43441563cfb1237e6b2eaafe0acfaa5e952cde
This commit is contained in:
Peter Foley
2012-12-31 17:03:07 -05:00
parent 120553e558
commit c97a46ad21
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openssl/UnpackedTarball_openssl.mk
View File

@@ -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 \

2
postgresql/postgresql-9.2.1-libreoffice.patch
View File

@@ -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 \