Age | Commit message (Collapse) | Author | Files | Lines |
|
Add --without-ca-bundle --without-ca-path options to curl configure
in Linux, to explicitly disable the hardcoded curl CA certificate
store.
If the store is not disabled, curl configure will try to find
one suitable for the Linux distro on which it's being built, leading
to possible problems when building on a Linux distro type while
targeting another Linux distro type (e.g. building on Red Hat
derivative targeting Debian derivative).
Change-Id: Id1ddf1d74e33bc66e4f7187e376d7379f5c4f36a
Reviewed-on: https://gerrit.libreoffice.org/23141
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 30b9c6a457de61f3c94431ecc75716f866c3379e)
Reviewed-on: https://gerrit.libreoffice.org/23245
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 0f567d9316941f0fcca4c260ad1e92fbe1a0df2d)
|
|
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)
Reviewed-on: https://gerrit.libreoffice.org/21880
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 01798050c13fdfc51aff95967f6b0177d5d7f5bd)
Change-Id: Ib30b2c1b8b3de72511d09c478297a7a5a4bc691e
Reviewed-on: https://gerrit.libreoffice.org/23002
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 1acbba539c0736a3c2fa54195c75f60c2752fac3)
|
|
otherwise build fails because of macro redefinitions warnings (that are
now fatal because of warnings=errors)
(cherry picked from commit 09e201fcf2813152335d50588dae0c38adc88d51)
Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7
Reviewed-on: https://gerrit.libreoffice.org/23272
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 74c4ae75c06068f8c208973636825603ca49a00e)
|
|
without -lnssutil3, the configure check for nss fails when using
internal nss:
configure:24028: checking for SSL_VersionRangeSet in -lnss3
[…]
…/UnpackedTarball/nss/dist/out/lib/libnss3.so: undefined reference to
`NSSUTIL_ArgParseModuleSpecEx@NSSUTIL_3.21'
causing curl to build without ssl support:
SSL support: no (--with-{ssl,gnutls,nss,polarssl,cyassl,axtls,winssl,darwinssl} )
This makes gdrive and other remote file methods fail
Change-Id: I098feb10a760c2f80a474d9205d6f1e403477efd
(cherry picked from commit 98d48dad9e807a4a40f4c3d1b5280d9e5156cb18)
Reviewed-on: https://gerrit.libreoffice.org/23191
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit bfe6eaae2c4e45e830db1e9f1710d251f86fb2a3)
|
|
Change-Id: Ie1659c62cbf77f8b685fdf7d79cd62336fa99005
Reviewed-on: https://gerrit.libreoffice.org/22916
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
(cherry picked from commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b)
Reviewed-on: https://gerrit.libreoffice.org/23103
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 5e4f1ab7c0450000f46d2c21639e69b96c38b1f0)
|
|
It seems like nss has activated -Werror, even though the code is not
warning free: [1]. This applies also to the additional patches that
would need to be patched to be a warning free patch, endless recursion.
To avoid messing around with something like that: [2], we disable
-Werror option for now. Also note, that [2] doesn't fix all warnings,
but only part of them so that we let with unsolved non-trivially to
fix warnings on different supported compilers if we would choose the
warning-free-compilation-path.
[1] https://groups.google.com/d/topic/mozilla.dev.tech.crypto/TgnF3tIMxJ0/discussion
[2] https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=ec2b9a90623b1ec5adb6ebe8d6651b35854786ec
Reviewed-on: https://gerrit.libreoffice.org/22650
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
(cherry picked from commit 486c91147c587febdacf3fa95d56633dbd703d5f)
Change-Id: I762c03acede6c4eac715d3b0589061eeabbcc7c2
Reviewed-on: https://gerrit.libreoffice.org/23102
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 8e6ee22f2bffecff9d85058c6c21312585c6f1cc)
|
|
Change-Id: Ic3a20f56250d99a347df5deaf785800a2f96e470
(cherry picked from commit 8d2ac08383f894f428da63f4653d0cbd6649e0db)
Reviewed-on: https://gerrit.libreoffice.org/23101
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit b99a91b790eedbfddb1ee93c183adb6d2405285e)
|
|
Reviewed-on: https://gerrit.libreoffice.org/22977
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 1827987fd11cd726005977e49d001283033f0419)
Change-Id: If84ce83cdbde530f7a6743c93ae210b030a41c30
Reviewed-on: https://gerrit.libreoffice.org/23001
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit e6a8fb33a948adf367baca31d54e1eb2f3ff0dc4)
|
|
Reviewed-on: https://gerrit.libreoffice.org/20882
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 817192b3f55be0b0a4a6e877a3c1ab95d3a4b4cb)
Reviewed-on: https://gerrit.libreoffice.org/22845
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 7530abcfa82393e22b21a0d54ce796caaecdc915)
Change-Id: If43ca99631fab5a3a04e7dead9b694cf52944666
|
|
Change-Id: I38e1015052058f8245eda0800e974486f01bdb27
|
|
Should fix crashes due to symbol clashes in ELF global namespace
where system's libharfbuzz.so.0 is loaded as well.
Change-Id: I35ffcbe4ac4de5a25cd8bf0cb9a8f0c11f4554c5
(cherry picked from commit 549130ab5d9616f7eb5504db31546b386737ccb2)
Reviewed-on: https://gerrit.libreoffice.org/22481
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 395995f03dd640aee28767f6d920901d91dd3bee)
|
|
(cherry picked from commit c64ea526dc71da6e3aad188ac71e58047ed74b5a)
and sync the various upgrade patches together
Change-Id: I3287d51430d7a0901dd8bbf2458b845bcf92a8d2
Reviewed-on: https://gerrit.libreoffice.org/22210
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit d2ef084eb0e26b5ee18133269249e7a80efb23d6)
|
|
and even if it had, everything ends up in liblo-native-code.so now
Change-Id: I5d62cf619867d6d0f7c5d4f91acf529706ebdc75
(cherry picked from commit e6ca4cf597d9fd1d2d34058adc70d22f2d7ec508)
|
|
(cherry picked from commit ce014ac76678f186da27faadc973af3eb253c817)
Conflicts:
download.lst
external/libvisio/UnpackedTarball_libvisio.mk
Change-Id: Ia4cb506a95a150b8106187719e9104760409dea6
|
|
(cherry picked from commit 12fc5b85ddc3b90b385ad0fc2ab0144a32bf9a4b)
(cherry picked from commit 7587f8bab881303f77864dae03999048e43c642f)
Change-Id: I1ad477b9db9ba960ae2c417799e5d91b63538d57
Reviewed-on: https://gerrit.libreoffice.org/20354
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit a18fed7db4f4a5cd85b08dce516a38e874758be6)
|
|
(cherry picked from commit b1e5983f04095346bee48dc3b413c0ae28789c27)
Change-Id: I493b79e70fb8003ce215e602f9b4ce92afa50150
Reviewed-on: https://gerrit.libreoffice.org/20156
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 2dab392c3b72b728245d96ab82f6f591af980efe)
|
|
- drop libxml2-freebsd.patch.1 (upstream libtool 2.4.6 does the same)
- drop libxml2-vc15.patch (fixed upstream)
Change-Id: Ia2f194f39efebd3d2ea924d23a5543ac53e93116
Reviewed-on: https://gerrit.libreoffice.org/20084
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 391bcf348d585b5e246ec808833af522edd371f2)
Reviewed-on: https://gerrit.libreoffice.org/20095
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit c8c414010033664ec09360543df797eef585be4e)
|
|
(cherry picked from commit 45d1abeff9d4041b3e174f0eddd10bfd6ab8a360)
Change-Id: I733cd21f6d8c7ea1e01f594d1483ad9c2043c188
Reviewed-on: https://gerrit.libreoffice.org/20094
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 5211c705e181f5a096602a63432b027c3f8a37ec)
|
|
Change-Id: Ice54f6c89eb2a2492d2b55a3f4edb13df4192446
Reviewed-on: https://gerrit.libreoffice.org/19985
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 055c248e1573cc7cd7988b28f8bb0bf64bf0d6c8)
|
|
This commit contains the recent Hunspell fix for Hungarian compound
word handling (commit 42807f970ac2d65f0d13a7c57eb454b210e92240
in Hunspell git repository), changing spell checking only
in Hungarian documents.
(cherry-picked from commit 2511a21841dd9dec735a53add8174e47d24deb88)
Change-Id: I1c6c3736ecf8c1e2fffcf1c53959b25dc9d27966
Reviewed-on: https://gerrit.libreoffice.org/19363
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit c004e4185405bf1880f6c5e1247b525531c84e3b)
|
|
Change-Id: I60c7540241c41f5063736f2a3d4817371411c8dc
(cherry picked from commit a799d7c9a66464f33bd8ee42d535e29a976d64ae)
Reviewed-on: https://gerrit.libreoffice.org/18716
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 183129ea128c0eccdb9bc1174c4e3c8a87e78d1f)
|
|
Change-Id: Ida7a5f5db5bba8d03bf31de760a908cee9a514e4
(cherry picked from commit a41a4a22f1a7e82ab64f28b71f5ce6acc1c04921)
|
|
The build relied on the presence of ANDROID_HOME envvar, now we pass
it explicitly.
Change-Id: If33ee2c6a22435151aad244378ee5aaf7b3cc913
(cherry picked from commit 2e6ed9befe172bcbfb14d5386bf3e0f151d0d666)
|
|
Library code from https://github.com/jaragunde/owncloud-android-library
This patch downloads, builds and installs the library from a tarball
uploaded to http://dev-www.libreoffice.org/src/.
Reviewed-on: https://gerrit.libreoffice.org/16190
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jacobo Aragunde Pérez <jaragunde@igalia.com>
(cherry picked from commit e6fe508d6835590c6245e62e2c014808453e7d92)
Change-Id: I28afaea4dabe2dab869b53b1881f4d5a6522943f
|
|
Change-Id: I666665c801367ff760b14b9f474952e9894b4791
|
|
Change-Id: Ie066c7f83ad15bec198f2091a3b084468c502766
(cherry picked from commit 064fd8342111bc62ba646e439c235bd495587a4a)
Reviewed-on: https://gerrit.libreoffice.org/18499
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Change-Id: I7b6910a131d95a74168ccee9140bc58393ceddb0
|
|
Ugly hack in ExternalProject_liborcus.mk as apparently it fails with the
define on Windows, and without on MacOSX :(
Change-Id: If0b52825122edd956044f61d413c57a76f485101
|
|
9a6cdce37e601b1406c71fef16ad9b315045c9da was trying to fix the problem
with exposing deprecated vars and functions in system's error_code.hpp
include file by patching bundled boost version. This approach would
only make sense, when upstream version is going to be fixed ASAP. Apply
another approach, and follow the same pattern as applied in external
libraries, by defining
-DBOOST_ERROR_CODE_HEADER_ONLY \
-DBOOST_SYSTEM_NO_DEPRECATED
instead of patching bundled boost version. This way, the code would
work with unpatched system boost 1.59 final as well.
Reviewed-on: https://gerrit.libreoffice.org/18201
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
(cherry picked from commit e00a3a684e22f45f36b4002ce726cb2975cb36ae)
Change-Id: I8684ca458ea4a5b7d7c3c3acfe7c14a6d19bc665
Reviewed-on: https://gerrit.libreoffice.org/18374
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: I4f33679332998f87b7bf1ad7c32aea64897dcaa6
(cherry picked from commit 0590fe942a7047b2cca480657a93f24144ea9f3c)
|
|
...which isn't even needed, as apr only uses APR_HAS_OS_UUID for apr_os_uuid_get
(apr_portable.h), which is neither used internally in apr nor by either of the
two clients of apr in LO, external/serf and ucb/source/ucp/webdav
Change-Id: I2e9d1f2640df0a8125ae2840f54488e77656c3ec
(cherry picked from commit aeafca133405e4a5fdbe253f8dcd2019d6b6b2a4)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
|
|
Reviewed-on: https://gerrit.libreoffice.org/17569
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit cc22b245bee8b6d243c22f73b8715f12ebd03f88)
Conflicts:
external/libodfgen/ExternalPackage_libodfgen.mk
Change-Id: I09f0528420577e4b417ee4e39a52150777910d13
Reviewed-on: https://gerrit.libreoffice.org/17797
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Reviewed-on: https://gerrit.libreoffice.org/17572
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 27ba1e316833671b1067fe8e6745530fa91c173d)
Conflicts:
external/librevenge/ExternalPackage_librevenge.mk
Change-Id: I8c55eb6eeca40faf8201af037f31a57ce9b64ac0
Reviewed-on: https://gerrit.libreoffice.org/17798
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Reviewed-on: https://gerrit.libreoffice.org/17568
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 0dc79f35aa3a373414c17f596ca4491a69083864)
Conflicts:
external/libmwaw/ExternalPackage_libmwaw.mk
Change-Id: Ibaba47be8aeefca7719d1ff335f551777130c6cd
Reviewed-on: https://gerrit.libreoffice.org/17800
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Reviewed-on: https://gerrit.libreoffice.org/17567
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 824e663cfbba436db32e4f2a20e3acbe275252e7)
Conflicts:
external/libetonyek/ExternalPackage_libetonyek.mk
Change-Id: Ib9ca5d65a493db7daa094b0dea3613637c4c184b
Reviewed-on: https://gerrit.libreoffice.org/17799
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Reviewed-on: https://gerrit.libreoffice.org/17547
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 68279e04de33201b8f75b55ad8cac9deef3d044d)
Conflicts:
external/libwpg/ExternalPackage_libwpg.mk
Change-Id: Ied2f331000c83d696fb5dd662860c3b51b95c616
Reviewed-on: https://gerrit.libreoffice.org/17796
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Reviewed-on: https://gerrit.libreoffice.org/17533
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit fff1d5bdd087f72178321f47b649323013d933cf)
Conflicts:
external/libwps/ExternalPackage_libwps.mk
external/libwps/UnpackedTarball_libwps.mk
Change-Id: I6661ff49e25921ce11dc04fffab84cf5db3c95fe
Reviewed-on: https://gerrit.libreoffice.org/17794
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Reviewed-on: https://gerrit.libreoffice.org/17548
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 4284337d92420373f2e1bcb40c9513db94a73bca)
Conflicts:
external/libwpd/ExternalPackage_libwpd.mk
Change-Id: I25dee74be0391b56587b4cc3eb9599708446825d
Reviewed-on: https://gerrit.libreoffice.org/17795
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
also fix DATEVALUE() function that was relying on this dataloss
Change-Id: I6030505a762df3ecbfe9a8331267846d3de817e8
Reviewed-on: https://gerrit.libreoffice.org/17049
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
|
|
... instead of the correct truncation.
Thanks to Lionel for the idea of the fix and his patience for newbies like me!
Change-Id: Iae9ec9251c0beb0c1856a6573f6ff7963d216256
Reviewed-on: https://gerrit.libreoffice.org/17016
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
- drop nss-linux-x86-patch.0:
this was actually patching OS/2-specific code so is evidently obsolete
- drop nspr-build-config.patch:
there does not appear to be any justification why this huge patch exists
at all, so the only reasonable thing to do is to drop it
- nss_macosx.patch:
drop several hunks relevant only to unuspported MacOSX/PPC platform
Change-Id: Id55fcb8eaa637c10a42203f1897480df8a6ec0fa
(cherry picked from commit 6e7991dfd8c54a833f4a9795a0d57f4690e92e6b)
Reviewed-on: https://gerrit.libreoffice.org/16727
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
Change-Id: Ic16111f21625fc510e79bba8122eaa60662f7a59
(cherry picked from commit 65327d615b64f487842e4c5d0ee7290f9c823a0f)
Reviewed-on: https://gerrit.libreoffice.org/16726
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
(cherry picked from commit a94acabae7defe562e3702f605c63afbd86f9696)
Change-Id: Ia4941184efb0cf6e84548f278e61e955a0b5b1f5
Reviewed-on: https://gerrit.libreoffice.org/16558
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
|
|
Change-Id: I23537399cbf325a7049f67654439714c3dc1421e
|
|
Change-Id: I19586eaae36fac7fa750614e6e31eff1a1e8440c
|
|
(cherry picked from commit ee3d40b30816a8fc6d4e8f984659c8dfac19ec3b)
Change-Id: I451f02ee93a798c9c1712082d59a7ff96b0d4a4e
Reviewed-on: https://gerrit.libreoffice.org/16508
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
...as discussed in 371cc81bd9ccbfbed25f810e70899c044280349e "external/liborcus:
Fix Linux RPATH:"
* When an external module produces multiple libraries (that we all install) that
depend on each other, they need to contain $ORIGIN in RPATH (strictly
speaking, those that do not depend on any other libraries from the module
would not need that, but it is harmless and easier to do that way).
* When an external module's libraries depend on other external modules'
libraries, and (at least some of) those other external modules are not
configuread as --with-system-*, they need to contain $ORIGIN in RPATH (again,
for simplicity, some libraries may get that even if they would not strictly
need it).
* Try to outsmart the external modules' libtool instances to not add (ultimately
bogus) paths to RPATH for dependencies on libraries from external modules
(either from the same module, or from anohter module not configured as
--with-system-*). The only time we do not outsmart libtool, and instead rely
on it (hopefully?) doing the right thing is when a given external modules'
libraries depend on libraries from excatly one other external module, and the
latter is configured as --with-system-*.
* That outsmarting means that if an external library depends both on external
libraries provided by modules not configured as --with-system-* (so RPATH
contains $ORIGIN, and the outsmarting is not suppressed) and on external
libraries provided by modules configured as --with-system-*: Then if the
latter are in unusual locations on the system that would require an RPATH
entry (which might be provided via the corresponding "pkg-config --libs", say,
and presumably would be honoured by libtool if we did not outsmart it), then
those paths are now erroneously missing from RPATH.
* That outsmarting also causes linking of some utility applications in module
redland to fail, but those are ultimately unused, so cut them off by patching
their respective sub-directory Makefile.in.
(cherry picked from commit 1d028d4783da69c5c0e6e0b59e0f8ac55eb9d2b1)
Change-Id: Iec05b3568fbcf04987018322c328b769ae4f5dab
Reviewed-on: https://gerrit.libreoffice.org/16506
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: I1534a0f43201a594b727ee8b42b697c8c1b5e224
(cherry picked from commit a952bf824ee1e79d9405072ae17dcc3cd3f27af2)
Signed-off-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: I25eae3874c7ca4cf4e23673604a1f77e1fa15451
(cherry picked from commit 0329dbd31011db8a8fe4ba806a624916e8c7249b)
|
|
This reverts commit 2f437f5a1003d9593b7e1d35fb31c2bd34c58151,
e0e989ef5b24fbe8222aa676aa6491eebce68974 and
81ae40bfe35fd55db789d75d1698f186f13402dd.
|