Commit Graph
21 Commits
Author SHA1 Message Date
Stephan Bergmann d4347f5d58 Fix external/gpgmepp Linux RPATH
In other external projects using libtool, we fix that by patching configure,
resetting hardcode_libdir_flag_spec[_CXX] at the end of the linux*) case block
that sets the Linux-specific value.  But here we run autoreconf in
ExternalProject_libassuan, so that patch in configure would be overwritten.  The
relevant code in configure comes from autoconf boilerplate, so we cannot just do
the same patch in configure.ac.  But we can reset hardcode_libdir_flag_spec
sufficiently late in configure.ac so that things still work as intended.

Disable tests that would build executabes linking against libgpgme.so, which in
turn links against the libassuan and libgpg-error libs, which would no longer be
found by the linker because of the dropped -rpath flags.  (Alternatives might
be to pass in LD_LIBRARY_PATH or to link with --allow-shlib-undefined.)

Change-Id: I7e37abf802d213347bd80383b7980d85cf0762d4
Reviewed-on: https://gerrit.libreoffice.org/50960
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-08 22:00:58 +01:00
Stephan Bergmann 24d0704fa4 Fix external/libassuan Linux RPATH
In other external projects using libtool, we fix that by patching configure,
resetting hardcode_libdir_flag_spec[_CXX] at the end of the linux*) case block
that sets the Linux-specific value.  But here we run autoreconf in
ExternalProject_libassuan, so that patch in configure would be overwritten.  The
relevant code in configure comes from autoconf boilerplate, so we cannot just do
the same patch in configure.ac.  But we can reset hardcode_libdir_flag_spec
sufficiently late in configure.ac so that things still work as intended.

Change-Id: Ic6c6123bcfe8bc2dac87812f919842519374abaa
Reviewed-on: https://gerrit.libreoffice.org/50959
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-08 18:08:14 +01:00
Andrea Gelmini f38064cb05 Fix typo
Change-Id: Iaa48657cdffc12b0e7bf1e39476e84445ea6fc3b
Reviewed-on: https://gerrit.libreoffice.org/49353
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
2018-02-07 17:46:18 +01:00
Stephan Bergmann 9b1adb42c9 Fix CustomTarget_postprocess/check_dynamic_objects for --enable-gtk3-kde5
Change-Id: Ie8c2389e8e0801b092abcfef751325cdf369b98d
2018-02-07 09:32:59 +01:00
Stephan Bergmann bf23fe3a4a Fix CustomTarget_postprocess/check_dynamic_objects for --enable-qt5
The dependency of Library_vcl on qt5 libraries (via vcl/qt5/Qt5Font.cxx) is
there ever since b66a7cbd84 "QT5 first stab on
implementing CommonSalLayout", but no idea whether that is by design or is a
hack that should eventually be cleaned up.

Change-Id: I4cec702709b37069987ec68c035628b5172b3543
2018-02-07 09:32:59 +01:00
Stephan Bergmann 4a2db3545a Fix CustomTarget_postprocess/check_dynamic_objects for --enable-dconf
Change-Id: I345055bf56828fc597d14c654d4819e87630da2c
2018-02-07 09:32:59 +01:00
Michael Stahl a0d533af0c check-elf-objects: add mergedlib libs for Linux-rpm_deb-x86_64@70-TDF
Change-Id: I7b0febee10a98809073f0bfd023d39d32684a566
2018-02-06 14:06:06 +01:00
Michael Stahl 7bf0b99736 check-elf-objects: add 32-bit libs for Linux-rpm_deb-x86@71-TDF-dbg
Change-Id: Ibd308d94c7cd92ab5e2590554b54517d2ef898fe
2018-02-06 12:18:17 +01:00
Stephan Bergmann 9cb3bd3967 basename -a is non-standard
...and apparently not supported on some tinderboxes like tb70 and tb71

Change-Id: I37dae3e7bbb0b9324adf04819fa87fb6a5b9f1d0
2018-02-06 10:14:35 +01:00
Michael Stahl 49696161be postprocess: enable the check-elf-dynamic-objects for real
Change-Id: Ie08d3dfc6306c18da7b1a5c000a75a18917c1f70
Reviewed-on: https://gerrit.libreoffice.org/45529
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-02-05 16:52:28 +01:00
Michael Stahl 2f5634e89a check-elf-dynamic-objects: wait only once
Norbert points out that wait without arguments will wait for all
outstanding processes.

Change-Id: If850fd4a2e46a2c05d2917d38478ee2d3112bd78
2017-11-29 15:26:10 +01:00
Michael Stahl 44aceccf5b fix check-elf-dynamic-objects -p
It needs to wait for all background tasks to exit.

Change-Id: I8770f3d79d66ab2fae727ae7cbbc00e3b22e5e54
2017-11-29 13:41:39 +01:00
Caolán McNamara 482d7ce61b change from glew to epoxy
because that works under wayland out of the box and gtk3 uses it already

Change-Id: Iefaac31e325534a81a5389f752804af917c1baef
Reviewed-on: https://gerrit.libreoffice.org/31213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-12-13 11:33:18 +00:00
Stephan Bergmann cfd2691e5b [API CHANGE] Remove salcpprt static library
...containing replacements for global operator new/delete (that can be linked
into executables), but which is no longer used.  The mail thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2012-March/028690.html>
"operator new no longer routes through rtl_AllocMemory in libsalcpprt under
gbuild link rules" has the details of how this was used on some platforms (but
not on others) before the switch to gbuild, and has been "lost" ever since---but
apparently a loss not mourned much over the years.

For the SDK, c5f974287f "INTEGRATION: CWS jsc3:
#i62434# copy libsalcpprt.a" added the library (under Linux) and
6db9c5af96 "INTEGRATION: CWS jsc3: #i62434# extend
link options for executbales to link libsalcpprt.a, LINUX only" added its use to
odk/settings/settings.mk, but fc0ca57f2c
"INTEGRATION: CWS jsc21" removed that use again (for no documented reason).  So
this is an incompatible change, but unlikely to actually affect any users of the
SDK.

Change-Id: Ia38b4c439f21fca3f5d9af7d1a34054e992054e9
Reviewed-on: https://gerrit.libreoffice.org/31810
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-12-12 09:16:34 +00:00
Michael Stahl 207c9a8f25 check-elf-dynamic-objects: check sdk/bin too
It takes almost no time, but this way of doing it changes the
interpretation of the -d parameter; not sure how important that is.

Change-Id: I9d29cdf96d7006d5daea00bcc41e613fbd30aac8
Reviewed-on: https://gerrit.libreoffice.org/29707
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
2016-10-11 18:09:54 +00:00
Michael Stahl bc47854ebd check-elf-dynamic-objects: OpenSuSE uses DT_RUNPATH, not DT_RPATH
... like Fedora, so check for either.

Change-Id: I0e88c8e6e7634e7cc483474bc3f654e666c3bab2
2016-10-11 19:35:01 +02:00
Norbert Thiebaud 91d406f5af check-elf whitelist libxml2 not libxml
Change-Id: If0179726861c867f9c25c13f9eb0b61faaee9524
2016-10-10 23:11:55 -05:00
Norbert Thiebaud 4189551d56 Support parallelism for check-elf-dynamic-objects
using that and restricting the tests to the content of
instdir/program bring the runtime on out slave builder from
4 minutes+ to just above one second

added -d <path> to override INSTDIR
added -p to indicate parallelism (no limit for now, so be cautious
with the -d you point too

Change-Id: I14c140f54bea329b82960843a6db44bfaf6c7108
2016-10-10 22:24:26 -05:00
Michael Stahl 7433ba52d3 check-elf-dynamic-objects: file is far too slow
... so use readelf itself to check if it's an ELF file.

Also just skip the SDK documentation which is 2/3 of all files.

Change-Id: Icfd3023dd5b2ccc4f4e94fbb05cdd4eb05051f86
2016-10-10 17:50:00 +02:00
Michael Stahl 4b4d5a8585 check-elf-dynamic-objects: add libxml/libxslt to global whitelist
Change-Id: Ida6495171f900edf4abe5f6ceba3a6dc2de7c2de
2016-10-10 16:26:37 +02:00
Michael Stahl 00f62f7b17 add bin/check-elf-dynamic-objects
Change-Id: Ia21375e376c25f9731455ef505422fa9bab884cb
2016-09-21 18:02:32 +02:00