Commit graph

104 commits

Author SHA1 Message Date
Michael Stahl
1a1f1fbdf0 gbuild: ExternalProject: remove second parameter again...
... now that everything is consistent.

Change-Id: I96c15159648815554280202eb1b6d274ead4e7b8
2013-05-07 01:41:26 +02:00
Michael Stahl
276021c761 gbuild: remove gb_ExternalProject_use_unpacked
It must always be used exactly once, so replace it with constructor
parameter.

Change-Id: Ifbe87065c19a5185a5705dc461656179002ece5d
2013-05-07 01:41:25 +02:00
David Tardon
491dea0a1f use gb_ExternalPackage_add_runtime_library for adding libs
Change-Id: I7be80bbef306db8f7ad585e95bfa4b6da0b30067
2013-05-01 16:55:38 +02:00
Caolán McNamara
81f336879b get curl building on aix
Change-Id: I4f8f2830a4c13637f6ee6aa06c554b88b95fcf45
2013-04-22 14:26:47 +01:00
Michael Stahl
14cdaf7f72 curl: add missing dependency on NSS external (zlib too)
Thanks again to Alex Thurgood, who doesn't have much luck this week :)

Change-Id: I0e902f6994b07fb277b3561fa5bfc8662e954202
2013-04-19 12:50:22 +02:00
Michael Stahl
075023b473 curl: link against the internal NSS if SYSTEM_NSS=NO
This is somewhat non-obvious since there is no way to override curl
configure's use of pkg-config for NSS... it needs actually 2 include
paths, and the --with-nss takes only one (which is extended with
include/ and lib/).

Thanks to Alex Thurgood for the report.

Change-Id: I06074de50daad19a2cc62fe4090d3c0fbfdb2cb1
2013-04-18 15:35:46 +02:00
Michael Stahl
4811c2dc9f adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3

lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.

openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.

Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
2013-04-15 15:26:32 +02:00
Michael Meeks
79b0046ba0 remove legacy build.pl prj/build.lst files. 2013-03-14 17:05:51 +00:00
Michael Stahl
b768611724 remove all d.lst
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-28 18:40:06 +01:00
Norbert Thiebaud
ed26c01be1 quiet external module build log unless failure
ExternalProject usually involve a configure and a make
step that produce a bunch of output usually irrelevant
including a large number of warning and other mess.
now that everything is pretty much in tail_build
these output get interleaved with useful output from
the build of the product and actually drown them in a logorrhea
of messy noise.
This store the output of external modules in a log file
and only print them as a whole if the module failed do build.
on a non-verbose build.

Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647
Reviewed-on: https://gerrit.libreoffice.org/2304
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2013-02-22 08:25:56 +00:00
Cédric Bosdonnat
c37b23e4c2 curl: fixed crashers in curl patch for system proxy
Change-Id: Ieb8e782eab9c9bde1d2099d8cc32eceef9f00002
2013-01-22 10:50:36 +01:00
Michael Stahl
d00bc09251 curl: it seems the build breaks unless this is formatted ugly
Change-Id: I554bb631a9b8d7b334483eeaed9b096451660a75
2013-01-21 22:15:52 +01:00
Cédric Bosdonnat
221ebb71ee curl: fixed crashers in curl patch for system proxy
Change-Id: Ieb8e782eab9c9bde1d2099d8cc32eceef9f00002
2013-01-21 18:32:27 +01:00
Stephan Bergmann
c10758417e ...and some more curl code layout massaging
Change-Id: Ifbd7dcc3fa8d18192d2ac2fc5faca1b0637c93c2
2013-01-21 17:57:54 +01:00
Stephan Bergmann
3770ec8978 More massaging to avoid odd layout-related warnings/errors from GCC
(...whatever it is that causes them to be raised at least in my build).

Change-Id: I52889de876e448ae8e90ec328e65cda2025968e2
2013-01-21 17:46:34 +01:00
Stephan Bergmann
1a0d5a7394 Tabs to spaces
Change-Id: Ib0d64c9d93f7ae73a160ad242a6731b781edaf0f
2013-01-21 17:30:55 +01:00
Cédric Bosdonnat
d912979b4f curl: patched to read IE proxy settings on Windows
Change-Id: I46605f6c8dfacab0feb5a446db458eed8e5756ee
2013-01-21 14:32:01 +01:00
Fridrich Štrba
16ac315c41 Enable NTLM authentication (using sspi.h) in Windows build of curl
Change-Id: I5e24338b937d32cd3a09f82bd3cf5a8b29f5d340
2013-01-18 12:45:24 +01:00
Tor Lillqvist
c29098917a Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.

Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-25 17:53:25 +00:00
Caolán McNamara
42db3c8036 commit delete various unused makefile.mks
Change-Id: I382423164fd65679d3b893ea0d9729508813b425
2012-12-06 14:07:26 +00:00
Michael Stahl
e097ec36d7 tweak some build.lsts...
Change-Id: Ia9b5b2775ad91661bf3d130417a1624fa4d855d2
2012-11-15 11:35:57 +01:00
Fridrich Štrba
8030ea8a94 Deliver the right curl libraries
Change-Id: I999591422ec9fb26025d7eda19d2e1271b310534
2012-11-14 09:26:52 +01:00
Cédric Bosdonnat
3a6233a040 Add PATH to have curl configure find ns{s,pr}-config in solver
Change-Id: I15dc96c13189d0dc76c616f3ab49d2ea099bc884
2012-10-31 12:03:30 +01:00
Tor Lillqvist
5d95db97b8 Fix MSVC build: LIB is not in environment so set it for the nmake command
Change-Id: Ic2f43692f003f6d3a88681d61fe21f52276b0b7b
2012-10-30 14:50:44 +02:00
Tor Lillqvist
685852d892 Correct location of the libtool-built libcurl
Change-Id: I0b997cdd3c133fa2212d519a136fa17f08a68730
2012-10-30 11:10:24 +02:00
Matúš Kukan
9f3a3ab69a tweak curl gbuildification
Change-Id: I17eae5612b88c3f57842a8ae50b1d062acf94765
2012-10-29 22:57:34 +01:00
Peter Foley
0f075129c9 convert curl to gbuild
Change-Id: I8c038a0c59660f4fb672d71c08e6ee0b56c302ee
2012-10-29 12:25:53 -04:00
Michael Stahl
6fb13dd1aa curl: disable use of debug configuration (needs msvcr90d.dll)
Change-Id: I7c22869028a78f48836741a4eb4cd5bbff16e884
2012-10-25 17:37:35 +02:00
Tor Lillqvist
711fcb41c5 Adapt for DISABLE_DYNLOADING instead of just iOS
Change-Id: I26bc5d87725eb9ae00387e42e9a65ed26a8ec168
2012-09-14 14:23:45 +03:00
Cédric Bosdonnat
bbe19f1301 curl: fixed internal nss configure to get nspr includes
The nspr includes aren't added when using nss-config while they are
added by pkg-config. This caused internal build to fail when nss devel
packages aren't installed on the system. Patched the configure to get it
working.

Change-Id: I86d7d56c0d6df2dbf69ba7ac2a6f930ecb4ae8fb
2012-07-11 11:49:16 +02:00
Fridrich Strba
4e06bafe80 Try to fix Windows build of curl
Change-Id: Ifd760cf91ef6c9afe10a110e9b8db2dcc53fd3c8
2012-07-02 15:27:17 +02:00
Cédric Bosdonnat
1ddd3d0f9a curl: updated to 7.26.0 to have NTLM auth working with NSS
The update work still needs the review of the windows patches as the
original sources have significantly been changed.

Change-Id: I80e493771f86f0dd87762b63c0c5ee3577fca388
2012-07-02 14:28:29 +02:00
Thomas Collerton
9520dbf59f EasyHack fdo#42783: get rid of CPU define/build system variable
Change-Id: I6a178f7ff9c8306e15bcfa847ad1e5e4f8476504
2012-05-09 16:31:31 +02:00
Bjoern Michaelsen
b1c3e8ae28 make gbuild the default assumption of build.pl
this removes dmake completely out of the build for migrated modules
build.pl now assumes modules to be gbuild, unless there is a
prj/dmake file

Change-Id: I674a036b182ee13c5ec093e83cb3d38133112d3b
2012-04-29 03:50:46 +02:00
Stephan Bergmann
7c4f2ec8a7 Simplify install name handling for external libraries on Mac OS X
...by allowing our special @___... tokens anywhere within an install name,
so that external modules can configure --prefix=/@___... etc.  This removes
the need for the special extshl and EXTRPATH=LOADER.  Also, a new
OUT2BIN_NONE can be used for external modules where the generated libraries
need the default EXTRPATH=OOO, but generated executables are only used
during the build and such need RPATH=NONE.
2012-02-29 18:46:38 +01:00
Josh Heidenreich
b469be0723 Added and improved READMEs for modules in libs-extern-sys 2012-02-09 18:23:49 +01:00
Stephan Bergmann
c4e5203999 Code modules no longer depend on stlport. 2011-12-16 17:45:10 +01:00
Tor Lillqvist
f522222415 Make also the libcurl library end in .so for Android 2011-11-10 01:23:48 +02:00
Caolán McNamara
84dfaea69b no .pc when built without configure 2011-10-04 11:52:28 +01:00
Caolán McNamara
dd0602b18a deliver the .pc file as well I guess 2011-10-03 09:37:18 +01:00
Thorsten Behrens
04b8b4fbbb Make Android cross-build working
In the spirit of 12759f67a3, change
external lib's config.sub to eat the arm-unknown-linux-androideabi
host os string. Also, permit shared libs again - seems Android can
handle those.

Added dictionaries to cross-build-toolset - idxdict is needed.

Should build up to sfx2 - some residual static lib issues there,
and in raptor.
2011-09-27 09:46:38 +02:00
Miklos Vajna
f05ff87ece curl: disable libssh2 support
Otherwise internal curl may pick up system libssh2.
2011-08-09 14:38:43 +02:00
Tor Lillqvist
496bba4a68 Cross-compilation support for Android 2011-06-09 19:29:05 +03:00
Tor Lillqvist
78f9b77628 Always compare CROSS_COMPILING explicitly to "YES" 2011-06-06 09:07:30 +03:00
Tor Lillqvist
56f35e6b39 Drop %_EXT% which was always empty 2011-06-03 13:27:35 +03:00
Tor Lillqvist
e5c37050ba Drop unnecessary quotes around platform triplets 2011-05-30 02:57:36 +03:00
Tor Lillqvist
8e872440fd Cross-compilation support and iOS in particular 2011-05-24 03:06:30 +03:00
Tor Lillqvist
bfed48d5b5 Drop OS2 2011-05-21 16:38:28 +03:00
Jan Holesovsky
5f7158e265 Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
	boost/aliasing.patch
	boost/makefile.mk
	cairo/cairo/makefile.mk
	cairo/pixman/makefile.mk
	dictionaries/da_DK/README_th_da_DK.txt
	dictionaries/da_DK/description.xml
	dictionaries/da_DK/dictionaries.xcu
	dictionaries/da_DK/makefile.mk
	dictionaries/da_DK/th_da_DK.dat
	dictionaries/de_AT/th_de_AT_v2.idx
	dictionaries/de_CH/th_de_CH_v2.idx
	dictionaries/de_DE/COPYING
	dictionaries/de_DE/COPYING_GPLv2
	dictionaries/de_DE/COPYING_GPLv2.txt
	dictionaries/de_DE/README_extension_owner.txt
	dictionaries/de_DE/README_th_de_DE_v2.txt
	dictionaries/de_DE/makefile.mk
	dictionaries/de_DE/th_de_DE_v2.idx
	icu/makefile.mk
	moz/makefile.mk
	python/makefile.mk
2011-03-09 10:38:32 +01:00
Fridrich Štrba
a0c84cafa5 Trying to remove the stlport mention from the code 2011-02-09 19:57:34 +01:00