Age | Commit message (Collapse) | Author | Files | Lines |
|
(cherry picked from commit 4757ffcc5cea1d627f57e551b7af0b39c8e40b47)
Conflicts:
libcdr/ExternalProject_libcdr.mk
Change-Id: Icdf57cb8a40256b4a474ededd3ba030bd79497f4
Trying to fix a boost::property_tree::json_parser error on windows
(cherry picked from commit 41d2b58b1ed5c1c4a1ca6ab3e6d7c4f15874d3a3)
Conflicts:
boost/UnpackedTarball_boost.mk
Change-Id: Iea3ec9a56eb008c6a0729a151b392f1e62925720
Trying to avoid linking with boost on Windows
Change-Id: Ic0c538dfad88f850d95f417f2741ef7dba7fc5e4
(cherry picked from commit 1e392ea7a0d1504f701f9fed1492e64a78a65339)
Reviewed-on: https://gerrit.libreoffice.org/3559
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
|
|
Change-Id: Ia7121c5e77ac86941fc70e08d1c824a93e842aff
(cherry picked from commit 29339357cfba19e80c3687639fe33e847d3e6f93)
Reviewed-on: https://gerrit.libreoffice.org/3269
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Change-Id: Ia2302ee8acdf638bf001f0a2663e09688c21c505
(cherry picked from commit 4b063c0e5b0e04986c98e7dd005a6223d8d9785a)
Reviewed-on: https://gerrit.libreoffice.org/2487
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Change-Id: Iadebf93d6002ce1a13152e9f7a8e4c490a4fbd94
(cherry picked from commit 8fad92201dc18592f2ffaecc798071f96fec82ba)
Reviewed-on: https://gerrit.libreoffice.org/2485
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>
|
|
Change-Id: Ia3f937b0b49093fbdbbe259b835a2d8a81633fe1
Blind "fix" for when using system ICU
No point in pointing to nonexistent ICU headers in solver if building
against a system ICU.
Change-Id: I5a151f3bfefd1913ad84a33d74af749558926312
CDR: Override pkg-config with SYSTEM_ICU
Change-Id: I665412f7d79247f6558337ac80bd866d2cfc3dce
CDR: We want ICU_LIBS always empty since this is a static library
Change-Id: I90730e08b07182fa73a1e3a60bed6da11cfd9e06
CDR: Actually apply the patch
Change-Id: I9ffd7123b8f79128c559f30eade6ae49bf809981
Signed-off-by: Petr Mladek <pmladek@suse.cz>
|
|
Conflicts:
RepositoryExternal.mk
libcdr/ExternalProject_libcdr.mk
Change-Id: Ibf21b856c0f9da276df60680513421be3c871a2d
Signed-off-by: Petr Mladek <pmladek@suse.cz>
|
|
Change-Id: I715975dfa93d736cb537076feab4afe6b75c162a
(cherry picked from commit 374f7465729c98f2cc8af72f876a8eab01d192a6)
|
|
Change-Id: I50f4396e6a8abf32d1a0f63cbfa93d2c59375326
|
|
This allows us to simply pass the already exported variables to invoked
configures, where the non-empty values will override the detection logic
there.
Change-Id: I7353a313814c58922e34843aeae380e5afa442ca
|
|
LCMS2_CFLAGS must be non-empty for it to override pkg-config.
|
|
Change-Id: I96de6b20b2a68f0982a30d33359e9e9cda9e642c
|
|
peter's gbuildifications caused and ocean of red, that
1/ was not followed up by any attempt by the author to fix
2/ I wasted a good part of the weekend to de-entangle with
only partial sucess
reverting the whole mess for now...
to be resubmited when a bit less borked...
This reverts commit c4c160a4519f20d50e7189ef92aac99b83c4cc6a.
This reverts commit faef2e51d0c7b74334a11400b205daf382805780.
This reverts commit 057ce1fe2911f51be97199bf95e175db8aebfa42.
This reverts commit a7d34af344900233ba08aee2a56a3daf85ab2421.
This reverts commit befae0ceb80deb4623f3e41ff88b6dcb63eca0ad.
This reverts commit 433b43bcd2dbd146a9d6342fab0704d653c50d29.
This reverts commit 93e2c4a9d257ebbe794fbaba888229857e7c42d8.
|
|
Change-Id: Icad3132c1710c62559c35964fe5ce3f466646f13
|
|
Rationale:
- it is advised to use max-jobs and num-cpus with the same value in wiki
- max-jobs was used only for lcms2 and few gbuild
modules outside of tail_build anyway.
Also fixes:
- really use CHECK_PARALLELISM when meant to
- EXTMAXPROCESS is not defined in gbuild;
use parent's jobservers in sub-make where possible
Change-Id: I501de732d223ce0c935081bd1d73da611d16ee88
Reviewed-on: https://gerrit.libreoffice.org/930
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
|
|
Change-Id: I9943dce422bd43b826baeaccaeb494d870aaaa77
|
|
Change-Id: I519d02da58ce5a2915f1e18b5a295f7c093e0f2e
|
|
Change-Id: I33a6c4659cf9e3792f17f73977637dab4667f58e
|
|
It breaks because LCMS2_CFLAGS happens to be empty, which the libcdr
configure script then complains about, because it thinks it hasn't found
lcms2. Work around that by including a space in the variable...
Change-Id: I16cc8278097dc7119d11fdabcc3be5d1ae8b4327
|
|
Change-Id: Ib481a70fdb67fcec1b72762c408b27f854fe4d1a
|
|
Change-Id: Iecf6609a35d4ecff728903d262ec10d3f8faf3bf
|
|
Define the various FOO_CFLAGS/FOO_LIBS used by libcdr in configure even
for the case of internal FOO, and then just pass those variables into
libcdr configure to get rid of SYSTEM_FOO conditionals.
Change-Id: I0edabc13f8a068cb13792a16499593b8c589da1a
|
|
Or rather, re-purpose that for consistency (and rename original to
gb_ExternalProject_use_external_project), to abstract over the
system/internal status of dependencies of external projects.
Use it in libcdr and replace exisiting uses in apache-commons.
Change-Id: Ie144600688fa884b5b6faa986c6b95bdfc1ee15c
|
|
Change-Id: I1674da35bf1d756bda5c4b991cc586462325c838
|
|
unfortunately the ExternalProject uses a StaticLibrary built in libwpg.
Change-Id: Ie4a8933247edbd2d53f697432a0848a05216237f
|
|
Change-Id: Idf9ad88293ca6a51f16f1230176d5c97558c66ed
|
|
Change-Id: I6e3bdf0cfcdfa46cf47e4db1e0703c948b4a35b2
|
|
Change-Id: I115cc8e17ae6cb89d215528acb0d0fe25eb71d85
|
|
Change-Id: I5bb93f9228e69dfd46b450089f34cac7204f10b8
|
|
Change-Id: Id686e9eeef9d64943360c6d7187f13b76a6c374a
|
|
Change-Id: Ia66854f21446fff9a04b1708964286c566333ab0
|
|
Change-Id: I37049887926513885872e3ffe3f94e8bb0796b17
|
|
Change-Id: I023c6b35c2a65da566ff5bb3aea772c99c90dda3
|
|
Change-Id: I5a8d3979e8b3e1e3d33882715fbb61f37bf27e35
|
|
Change-Id: If440c551aedf805eb364c0fe575e8c5f4f66c18f
|
|
Change-Id: I067ab0a4559bf7ee0da36a67567e0db9a6e34f87
|
|
Change-Id: I3ee442ab6dac31eb7daac32e7a9ed5c6526f07ba
|
|
Change-Id: I12c8ab5779d952eb640298478da7084b5f643568
|
|
Change-Id: I616d284bb300c803d29786e50bb019fa3f2dff19
|
|
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
|
|
|
|
|
|
|
|
|
|
Nah, will use the patch by Lubos instead.
This reverts commit 85f074554788e2d8da73e77855ca06bc0fdfbaa4.
|
|
|
|
|
|
|
|
This reverts commit 4147de18731c7637ab5654797c21b39069695ff5.
|
|
|