Commit Graph
32 Commits
Author SHA1 Message Date
Michael Stahl cd44182c34 openssl: fix MSVC 64-bit build
For whatever reason OpenSSL wants to use "masm" (ml.exe) on 32-bit
builds but "nasm" on 64-bit builds - this despite INSTALL.W32 claiming
that only nasm is "supported".

But /safeseh doesn't make sense on 64-bit anyway because there
is no "unsafe" SEH there, so just apply the patch only for 32-bit.

Change-Id: Ie32b17dfeeaf11c49ee29c3181021ffa5bd99091
2018-01-08 18:11:28 +01:00
Michael Stahl 8f3ca08319 openssl: MSVC build: link and run MSASM with /SAFESEH
Actually the assembler requires lowercase /safeseh, oddly enough.

Change-Id: I1569409a2d6358282a7463ea996a6b1615e6ed8c
2018-01-08 12:39:47 +01:00
Michael Stahl 4fcdc190af external: consistently use gb_ExternalProject_use_nmake
... instead of hard-coding some subset of the variables everywhere.

Change-Id: I5eac5663563ee9d6cb7b57f5f6e9d55560587276
Reviewed-on: https://gerrit.libreoffice.org/44167
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-11-01 19:52:53 +01:00
Michael Stahl c102efd27a openssl: remove Windows XP patch
Change-Id: I6e80c33d134100235ac1007154ca7f6151b59c2f
2017-05-30 20:19:22 +02:00
Stephan Bergmann 8646ab97dc Remove MinGW support
In OOo times, there'd originally been efforts to allow building on Windows with
MinGW.  Later, in LO times, this has been shifted to an attempt of cross-
compiling for Windows on Linux.  That attempt can be considered abandoned, and
the relevant code rotting.

Due to this heritage, there are now three kinds of MinGW-specific code in LO:

* Code from the original OOo native Windows effort that is no longer relevant
  for the LO cross-compilation effort, but has never been removed properly.

* Code from the original OOo native Windows effort that is re-purposed for the
  LO cross-compilation effort.

* Code that has been added specifially for the LO cross-compilation effort.

All three kinds of code are removed.

(An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing
--with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.)

Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568
Reviewed-on: https://gerrit.libreoffice.org/34127
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-02-10 18:01:27 +00:00
David Tardon a97371bf4d upload openssl 1.0.2k
Change-Id: I26d49db0207b3f4f64aa9698da4cf3567d195834
Reviewed-on: https://gerrit.libreoffice.org/33800
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
2017-02-01 20:48:51 +00:00
David Tardon f595e426e3 cond. build is already handled in Module_external.mk
Change-Id: I5efe3bafc4f0b97578a75dc1f43e6c130a93bc4a
2016-10-23 20:13:21 +02:00
Stephan Bergmann f255c3e96e [API CHANGE] Remove HAVE_GCC_VISIBILITY_FEATURE, always true
* GCC documents -fvisibility at least as far back as the GCC 4.0 online
  documentation at
  <https://gcc.gnu.org/onlinedocs/gcc-4.0.4/gcc/Code-Gen-Options.html>.

* For external code, odk/settings/settings.mk unconditionally set
  HAVE_GCC_VISIBILITY_FEATURE for all platforms other than Windows.

Make this a fatal configure error for now.  The check should be removed
completely after LO 5.3 branch-off.

Change-Id: I1de415b6ed1591e0a7b6640ece861b6f0ef74112
Reviewed-on: https://gerrit.libreoffice.org/29073
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-09-20 07:34:27 +00:00
Tor Lillqvist b04a27ad6f Revert "Add --with-prebuilt-openssl"
Building OpenSSL works fine for me now with a fresh Cygwin.

Change-Id: Ic824704746ab59324e7a533b6c5545b6f1aa59f6
2016-03-09 12:32:31 +02:00
Michael Stahl a420a4346e 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
2016-03-07 23:07:46 +01:00
Caolán McNamara 01798050c1 upgrade openssl to 1.0.2g
We can't "break symlinks after extracting tarball" because they populate
that dir during the build now. So instead cripple mklink.pl to
copy instead of link. (Configure no-symlinks simply skips the symlink
step instead of copying, so that appears useless)

Change-Id: Ib30b2c1b8b3de72511d09c478297a7a5a4bc691e
Reviewed-on: https://gerrit.libreoffice.org/21880
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-03-07 16:07:39 +00:00
Tor Lillqvist 05b44143d2 Revert "More LTO fixes for android"
Seems to cause tinderbox build breakage, sigh.

This reverts commit 1c1b788f38.

Change-Id: I5a69e186e0f8f71c2fcc81d27bebe2253fd240bb
Reviewed-on: https://gerrit.libreoffice.org/21699
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2016-01-22 06:49:01 +00:00
Peter Foley 1c1b788f38 More LTO fixes for android
Change-Id: Id9b4873b8213d9913d54b3821ba0be6ffa7ac188
Reviewed-on: https://gerrit.libreoffice.org/21612
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
2016-01-22 06:35:41 +00:00
Michael Stahl e9cd508736 configure: hard-code /usr/bin/{sort,find} for Cygwin
... to avoid calling C:/Windows/system32/{sort,find}.exe, if those
happen to be first in PATH.

On a Windows 7 system, the other conflicts appear to be harmless,
we don't use "more", "expand", "timeout", "whoami".

Change-Id: Iceefeb7ee6725291b04c0eba465991bb1df96b57
Reviewed-on: https://gerrit.libreoffice.org/21175
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
2016-01-07 08:44:28 +00:00
Tor Lillqvist cf029192e4 Add --with-prebuilt-openssl
Don't ask.

Oh well, if you want to know: For some people, like me, Cygwin and its
Perl run into horrible trouble with the fork() emulation when building
OpenSSL. (But my Cygwin works fine for all else in the build. Go
figure.)

So I came up with a way to use prebuilt OpenSSL binaries. Not to be
used for release builds, of course (and the configury checks for
that), as long as our policy is to build all we can from sources.

Change-Id: Ic303bdf0c620c5122aca3d646fa1f0587221e70f
2015-12-10 17:01:19 +02:00
Michael Stahl 2a675287af openssl: drop SunStudio specific patch hunk
Besides, wtf is it using -fast by default so the binaries don't run on any
system other than the one that did the build?

Change-Id: I5adc26fb6370a5292721df3167afc5485c15cb0a
2015-04-14 22:43:35 +02:00
Caolán McNamara 04a9801510 upgrade to openssl-1.0.2a
and de-ifdef-per-platform the patch makefile so an upgrade attempt on one
platform tests the patchs applying on all platforms

ubsan.patch.0 was effectively applied upstream while need
to add http://rt.openssl.org/Ticket/Display.html?id=3650 to build
under windows

Change-Id: Ieffd9bc3dd861a94a083d8b6b8d4117bba7f527c
Reviewed-on: https://gerrit.libreoffice.org/15183
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-09 20:25:30 +00:00
Stephan Bergmann 86b436d797 external/openssl: Work around -fsanitize=null
Change-Id: Ic47a1b43323f84971aed9b3cdb2ec83f9e931d6a
2015-01-06 15:21:42 +01:00
Michael Stahl 8bd6bf93b7 fdo#82430: configure: MSVC build: avoid using SSE2 instructions
MSVC 2012 for x86 defaults to -arch:SSE2; binaries do not run on any AMD
32-bit CPU, neither on Intel Pentium III.

http://msdn.microsoft.com/en-us/library/vstudio/7t5yh4fd%28v=vs.110%29.aspx

Change-Id: Ie8253137db2699f2a7fa69c4ac4e7ded90931e3e
2014-08-14 18:55:17 +02:00
Thomas Arnhold 38f259e79c win64: make openssl work
fix windows style path separator to unix style, needed for cygwin.

Change-Id: I4de78d6901378644857c28a59467b59ef886f47b
Reviewed-on: https://gerrit.libreoffice.org/10855
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-08-13 13:47:36 -05:00
Douglas Mencken f4beadc6e2 avoid -arch for bundled OpenSSL, Python3, and nss/nspr on OSX@PowerPC
this fixes gcc: error: unrecognized command line option '-arch'

The '-arch' option is part of Apple's extensions to GCC, and it is uncompatible
with "vanilla" GCC from FSF. Also, we're not building "universal binaries".

Change-Id: I44e7c72bbb1dd4be5ac9cdbc4f210aaccea513b4
Reviewed-on: https://gerrit.libreoffice.org/10117
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-07-11 14:42:57 +00:00
Michael Stahl 0a9f1cf88a openssl: stop (ab)using fix_end_of_line to break symlinks
Win32 make has problems because the command line gets too long.

Change-Id: I157b7b2b61353b158b1a3f412331e54aafec206c
2014-06-09 17:05:51 +02:00
Christian Lohmaier e175eb3ced fdo#77891 fix python crash when in GUI mode, target WinXP with VS2012
VS2012 did change return value of fileno function, this results in a
crash when run in GUI mode (but not when launching from a shell), as
python tries to access the nonexisting stdin/stdout/stderr
Also explicitly target Windows XP

Change-Id: Ic783713b55453f3c38b2e766a664b7f4678711de
2014-05-19 19:58:54 +02:00
Michael Stahl 1c772b1682 openssl: fix WNT patch to apply
Change-Id: I31494d4314557672b7e3c2ff6846663fb9ed981a
2014-04-08 14:35:56 +02:00
Caolán McNamara ccd048fa17 bump to openssl-1.0.1g
Change-Id: I1e0ee6aa3d136c75309c5c70011da787806efa1f
2014-04-08 12:19:29 +01:00
Caolán McNamara 9af4ecd2b4 CVE-2014-0160 heartbeat
Change-Id: I00ee89f69d85010be5d3a537092349fa9eeb71c8
2014-04-08 09:41:48 +01:00
Michael Stahl 593ff64283 normalize values of MINGW_SHARED_GCCLIB/MINGW_SHARED_GXXLIB
Change-Id: I4f4cecd95f87b9d37fa1b1a270cf554d7707aaa2
2014-03-11 11:57:18 +01:00
Douglas Mencken 00dabbfc7c OpenSSL @OS X: choose correct build target
Change-Id: I58f3cc12f2fa177c26608d372f99c086503a13a5
Reviewed-on: https://gerrit.libreoffice.org/8205
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2014-02-24 17:03:50 +00:00
Michael Stahl e3abec3f07 fdo#74825: fix missing lcms2/libxslt/curl in installation sets
The assumption that all configure variables had been normalized to
TRUE/<empty> turned out not to hold; convert a bit more in that
direction.

(regression from 4af38b099c)

Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
2014-02-12 09:53:08 +01:00
Douglas Mencken 8ae8d5165c Get bundled openssl to be used on OS X too, at least on OS X <10.7
Also note that OpenSSL is incompatible with -fvisibility=hidden on OS X

Change-Id: I1fc3cf4d515ef210f996cb04ba9c1b3216109137
Reviewed-on: https://gerrit.libreoffice.org/7233
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-20 15:05:24 +00:00
Michael Stahl eca3dec204 fdo#42783: remove CPU variable from environment
Replace uses with CPUNAME instead, and get rid of the horrible
postgresql patch that worked around environment leakage.

Change-Id: I38ccabfc438360524a272901bb9332ea708e274c
2013-11-07 01:34:43 +01:00
Khaled Hosny fde2065b0f fdo#70393: move openssl to a subdir of external
Change-Id: I10bf92b18ee5ad56f1b4fbee3e4008b35b822be4
Reviewed-on: https://gerrit.libreoffice.org/6547
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-11-04 02:29:08 -06:00