Commit Graph

27 Commits

Author SHA1 Message Date
6bc81d4e78 Simplify some $ENABLE_DEBUG expressions
Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c
2014-08-29 17:14:53 +02:00
548da05c53 curl: work around mysterious xcopy failure
When building with Win32 make, the xcopy at the end of the build fails
with "Invalid arguments" error, which is clearly wrong, since the
arguments are exactly the same as before, and furthermore curl is not
built with GNU make at all, but with nmake!  W-T-F?

Change-Id: Idc0b362202e1d14722573662bebeda0bc7070660
2014-06-09 17:05:51 +02:00
21236b9890 upgrade to curl-7.36.0
CERTINFO was included upstream:

commit f6c335d63f2da025a0a3efde1fe59e3bb7189b70
Author: Patrick Monnerat <pm@datasphere.ch>
Date:   Wed Oct 30 11:12:06 2013 +0100

    NSS: support for CERTINFO feature

Change-Id: I83de2fd863f9387b83b5ebcbec70cbe6df7681d4
Reviewed-on: https://gerrit.libreoffice.org/9307
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-05-11 20:48:04 +00:00
593ff64283 normalize values of MINGW_SHARED_GCCLIB/MINGW_SHARED_GXXLIB
Change-Id: I4f4cecd95f87b9d37fa1b1a270cf554d7707aaa2
2014-03-11 11:57:18 +01:00
92ca6ef11d curl (bundled): fix logic breakout
use --with-nss only on platforms other than Mac OS X and iOS

(see commit 4e8ab2198819551d07f303f80d2bd5f5ae53bc6e)

Change-Id: Ie6cb35ea5f5db2d08f303f70d1559188912ba8e5
Reviewed-on: https://gerrit.libreoffice.org/8418
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-03-02 12:06:46 -06:00
4e8ab21988 curl (bundled): with-darwinssl option is not compatible with OSX SDK 10.5
Change-Id: I3e8576926df875d73de10d5212adde2685c3a799
Reviewed-on: https://gerrit.libreoffice.org/8386
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-03-01 07:24:25 -06:00
d729d169de normalize values of CROSS_COMPILING
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
2014-02-27 18:09:01 +01:00
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 4af38b099c741c3676aefeb20c515913aaeed666)

Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
2014-02-12 09:53:08 +01:00
8804d3a63a Fake proper lib ID for macosx-change-install-names into external/curl
Change-Id: I4ce1123698ced152c076a4d0e4ad276be9a55bfe
2014-01-20 23:29:27 +01:00
7edb1f5f32 curl: we really want --with-darwinssl on Mac for libcmis
(regression from 2fd70b6bf799843d2d9987cc90a5b373f31039f7)

Change-Id: I9e1d4d17582011a067aecf47144bb70643fac806
2014-01-17 15:54:59 +01:00
2fd70b6bf7 Get bundled curl to be used on OS X too
Don't force "yes" on Darwin.

Change-Id: I3a6a2ecdf15325d07fb22b9a6bb0da7b313036cb
Reviewed-on: https://gerrit.libreoffice.org/7197
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-17 11:55:32 +00:00
01d26477a1 Backported commit f6c335d63f2da025a0a3efde1fe59e3bb7189b70 from curl
This commit enables CURLINFO_CERTINFO when curl is built with NSS
support but not openssl.

Change-Id: I1482b34d83a0ae0f47d524a940bb90ed072363a6
2013-11-19 14:52:39 +01:00
460d6ce526 curl: use WNT native Schannel SSL/TLS implementation
This should give better OS integration for things like adding CAs.

Change-Id: I53fbfad402618e98d4116a0fecf0bf59e905e292
2013-11-19 00:07:22 +01:00
43d477b168 curl: actually use Makefile.vc10 instead of Makefile.vc9
... they are currently identical but it seems more appropriate.

Change-Id: I5ecd7209bc29f32a2f04299d35364a10fe381a35
2013-11-18 23:40:52 +01:00
461bdf0b4f curl: try to use Mac OS X native SSL/TLS implementation
This should give better OS integration for things like adding CAs.

Change-Id: I9578f7194f920a9ebc6c18696e12c8c2e2bb2d80
2013-11-18 23:22:23 +01:00
88e65df2e4 curl: upgrade to version 7.33.0
- from curl-7.26.0.patch:
  * drop ADDCFLAGS stuff, must be some dmake relic
  * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000
    which is unsupported (and ws2_32.lib is linked anyway...)
  * split out curl-freebsd.patch.1
- curl-7.26.0_win.patch:
  * drop the library renaming stuff - can be handled in Package and
    RepositoryExternal.mk without patch
  * rename the rest to curl-msvc.patch.1
- drop curl-aix.patch:
  presumably don't need special check for V7BETA since it's released now
- drop curl-7.26.0_strlcat.patch (obsolete)

Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0
Reviewed-on: https://gerrit.libreoffice.org/6642
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-18 14:27:40 -06:00
cca8c8cf79 nss: upgrade to 3.15.3
- from nss_macosx.patch drop nmedit hunk (removed upstream)
- adapt include and lib paths to changed tarball directory layout

Change-Id: Ia5dcce8dfd9d10e7e4ba689eefa9f39a51596dfe
Reviewed-on: https://gerrit.libreoffice.org/6670
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-14 11:27:38 +00:00
5d8f48c81e solver doesn't solve anything...
... it is an abbreviation of "Solar Version".

Since nobody can remember that:

remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath
and any mention thereof.

Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad
Reviewed-on: https://gerrit.libreoffice.org/6515
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-10-31 15:42:24 +00:00
5e50987119 Fix build for Android: Don't use SYSBASE that way
Change-Id: Ib4027a28a2e4b19842508a6006c1c56a06d021ed
2013-10-30 20:06:37 +02:00
07a31ccc02 curl: set the right RPATH too
Change-Id: I409bb44541748ad69b5087243f4ea8142e424fe0
2013-10-30 13:07:51 +01:00
8df17a3409 gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-10-28 20:17:26 +01:00
349015b18e gbuild: remove gb_ExternalPackage_add_library_for_install
Deliver all external libraries to INSTDIR directly.

Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
2013-10-27 00:50:02 +02:00
936a1a9daf curl: use libraries from WORKDIR
Change-Id: Ib4a3aef1ff1d42270e737659b3f663260d3f1175
2013-10-24 00:24:16 +02:00
30e1d4c0a9 curl: libcurl.so.4 goes into instset, not libcurl.so!
Currently we ship a libucpftp1.so with NEEDED libcurl.so.4 but that file
is not actually in the instset, just a libcurl.so with SONAME
libcurl.so.4.

(regression in LO 4.0.0)

Change-Id: I3a194c83c408587dd83ed4c690aa381664040c6f
2013-10-24 00:24:15 +02:00
cffad63025 nss: remove nss-config and nspr-config
Apparently curl is the only external that is looking for these,
but it turns out that we already pass --with-nss=dir to its configure
which overrides the nss-config/nspr-config calls.

Change-Id: I967e74a74690a64b5bccfd98d1509bba1dd12259
2013-10-23 00:37:11 +02:00
cc4aca0c9f Fix building from inside modules moved to external
Change-Id: Id6023dc3751fe70984f489682be17d1ab1855f71
2013-10-18 21:52:01 +02:00
a777285f9b fdo#70393: move curl to a subdir of external
Change-Id: I76401636aab7d4de198912b154d6ec3da35a711d
Reviewed-on: https://gerrit.libreoffice.org/6298
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
2013-10-18 06:50:42 +00:00