external/openssl/ExternalProject_openssl.mk | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit a420a4346ec21ea561f1321767d6a5eed98df02b Author: Michael Stahl <[email protected]> Date: Mon Mar 7 23:04:37 2016 +0100 openssl: fix WNT build For reasons beyond human understanding, the many-tentacled horror that openssl calls its build system puts headers in "inc32" directory on Windows and "include" on other platforms in 1.0.2g. Change-Id: If03c80f5a31bb6e378cd187051b020579af7f7bd diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index c22ec7b..92c751e 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -70,6 +70,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): && cmd /c "ms\do_ms.bat $(PERL) $(OPENSSL_PLATFORM)" \ && unset MAKEFLAGS \ && nmake -f "ms\ntdll.mak" \ + && mv inc32/* include/ \ )) else @@ -92,4 +93,5 @@ $(call gb_ExternalProject_get_state_target,openssl,build): -fvisibility=hidden))" \ ) endif + # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
