summaryrefslogtreecommitdiff
path: root/solenv/gbuild
AgeCommit message (Collapse)AuthorFilesLines
2020-01-08Enable Clang -Wembedded-directiveStephan Bergmann1-0/+2
...which might have helped avoid the confusion with patch set 6 of <https://gerrit.libreoffice.org/c/core/+/84765/6> "python3: upgrade to release 3.7.6", in that it would have reported: > pyuno/source/module/pyuno.cxx:340:2: error: embedding a directive within macro arguments has undefined behavior [-Werror,-Wembedded-directive] > #if PY_VERSION_HEX >= 0x030200f0 > ^ > pyuno/source/module/pyuno.cxx:342:2: error: embedding a directive within macro arguments has undefined behavior [-Werror,-Wembedded-directive] > #else > ^ (-Wembedded-directive was introduced with <https://github.com/llvm/llvm-project/ commit/300237f00c7ddf9c74de96272f2bb571fda61202> "Add a warning flag for ext_embedded_directive. gcc considers this undefined" in 2011, so should be available in all versions of Clang relevant for us.) Change-Id: I4d90212aac30ba8715496d8c99cc6de05c6dc99a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86394 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-01-06macOS /usr/bin/mktemp already adds a dot to the prefixStephan Bergmann1-1/+1
(at least the version on macOS 10.15.2 does) Change-Id: Ie7525216542e1db686adb151774d20ff69d9e8f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86252 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-19Fix typo in codeAndrea Gelmini1-3/+3
Change-Id: I7c71e16628819bd60664f9b4dc70f0f0762afb48 Reviewed-on: https://gerrit.libreoffice.org/85521 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2019-12-16Revert "Make font-based unit test depend on instdir fonts"Jan-Marek Glogowski40-64/+57
The following build: $ make clean && make gb_CppunitTest_sc_ucalc [...] $ cd sc $ make gb_CppunitTest_sc_ucalc triggers: sc/CppunitTest_sc_subsequent_filters_test.mk:133: *** Missing font filelist -> run make more_fonts extras. This didn't help the general Win32 font build problem AFAIK. There were additional patches to the way Windows loads the LO provided fonts, so just revert this. This reverts commit 368c996b24e09c427a30972b3405493328db6779. Change-Id: I841f96fe8312c47980c8e3be2e9d88242df5b28d Reviewed-on: https://gerrit.libreoffice.org/84633 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-12Enable -Wdeprecated-copy-dtor where availableStephan Bergmann1-0/+4
We already get -Wdeprecated-copy (warning about implicitly defined copy functions that will in the future be deleted because other user-provided copy functions exist) automatically through -Wextra, where available. -Wdeprecated-copy-dtor (warning about implicitly defined copy functions that will in the future be deleted because of a user-provided dtor) is split off into its own warning excluded from -Wextra for somewhat unclear reasons, see the discussion at <https://gcc.gnu.org/bugzilla/buglist.cgi?quicksearch=88136> "-Wdeprecated-copy is draconian and shouldn't be in -Wall". But -Wdeprecated-copy-dtor has been useful in finding issues (esp. the Clang 10 trunk version, which, unlike the GCC 9 version, also finds copy functions that are implicitly defined because they are used from template instantiations), see 3e59716375a240576fd6d8759b32b4319506ed70 "Prevent BroadcastRecalcOnRefMoveHandler copies" and 4f98cd0f9ce9c2a331a5d34b3ef9d18f9bb6b235 "ScShapeChild has broken copy functions". We need to disable -Wdeprecated-copy-dtor in files included from external/boost, and in two compilerplugin/clang/test/ files. Change-Id: I74b159c3a046e23661473ddbfe53c92c4136a9db Reviewed-on: https://gerrit.libreoffice.org/85073 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-08Improve -fdiagnostics-color handlingStephan Bergmann1-2/+2
...following up on 13b52f50e52d226c935dcb94fac641c59a77f13f "gbuild: color gcc output if possible". Unconditional -fdiagnostics-color=auto overrode the -fdiagnostics-color=always I specify in CC/CXX to mitigate using the GNU Make -O option. Forcing -fdiagnostics-color=always iff gb_COLOR is set should give the desired results in all cases (colored output to a terminal when calling make without -O but using a GCC that defaults to -fdiagnostics-color=never, as well as colored output to a terminal when calling make with -O). Change-Id: I629bad4bceb15af3ed43f42038825bd1481b33dd Reviewed-on: https://gerrit.libreoffice.org/84710 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-08gbuild: color gcc output if possibleThorsten Behrens2-0/+5
Enable gcc to color its diagnostics output - depending on distro build flags, might need GCC_COLORS defined in the environment. See also gbuild.help.txt. Change-Id: Ibeaaaadcaccc2847c0105c266b977fee6f4e9960 Reviewed-on: https://gerrit.libreoffice.org/84705 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-12-07Remove redundant gb_YACC indirectionStephan Bergmann5-7/+2
(as discussed at 0a803c0a41f46be4019ddd2768b4be5669b7ab59 "Honor BISON passed into configure") Change-Id: I160a3c97414be47cd1efef0b7fac4af93a398ac6 Reviewed-on: https://gerrit.libreoffice.org/84684 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-06Honor BISON passed into configureStephan Bergmann3-3/+3
...and require new-enough Bison for --enable-compiler-plugins to not generate bogus loplugin:external warnings in Bison boilerplate code. (As happend for me on macOS where /usr/bin/bison is version 2.3. Not sure which versions exactly are too old, but at least 3.4.1 is known good. If other versions newer than 2.3 turn out to be problematic too, the configure.ac check will need to be adapted.) No idea why there need to be three places across solenv/gbuild/ that set gb_YACC (to the same bison in each case), but leave that to be cleaned up later. Change-Id: I01d8219726f8df7895631b817866207327367759 Reviewed-on: https://gerrit.libreoffice.org/84650 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-04tdf#128133 WIN don't exit after link-output filterJan-Marek Glogowski3-7/+3
The linker output filter command (gb_filter_link_output) ends with an exit "${PIPESTATUS[0]}", which will quit the current Makefile shell command always after calling the linker. This prevents the later shell code of that line to run, which includes the merge of the DeclareDPIAware.manifest. That manifest would tell Windows that LO binaries are "<dpiAware>true</dpiAware>", to prevent System DPI scaling. Since it's not merged, LO is scaled by the OS, resulting in blurry fonts. Since there is no reason to have an extra make "function", like ifeq or multiple definitions, this includes the code directly. Additionally the MS linker has localized output, so this patch uses a more generic regexp to filter-out the default link message, which works with the English and German locale. Change-Id: I0099f6c38ca0eda18c7b0c108529bc73189c1504 Reviewed-on: https://gerrit.libreoffice.org/84099 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-11-27use the same config file for skia build and using itLuboš Luňák1-0/+2
So that the setup is consistent. Change-Id: Ia113c7bf79036e3ec7585263ed70da68e461fbac
2019-11-20/safeseh valid only on Win32Julien Nabet1-2/+3
On Win10 with master sources updated today + Visual Studio, I had this part: [build CXX] bridges/source/cpp_uno/shared/component.cxx Microsoft (R) Macro Assembler (x64) Version 14.23.28107.0 Copyright (C) Microsoft Corporation. All rights reserved. MASM : warning A4018:invalid command-line option : /safeseh Assembling: C:/BLP/core/bridges/source/cpp_uno/msvc_win32_x86-64/call.asm [build CXX] bridges/source/cpp_uno/shared/types.cxx See this link for rationale: https://docs.microsoft.com/en-us/cpp/build/reference/safeseh-image-has-safe-exception-handlers?view=vs-2019 According to https://bugzilla.mozilla.org/show_bug.cgi?id=581909 (9 years ago) "...For some reason ml64 ignores the -c following -safeseh..." I don't know if recent Visual Studio versions still ignore or not the following parameters but let's fix this Change-Id: I9ae5416f32429597fab35fcce8bf06707af4def5 Reviewed-on: https://gerrit.libreoffice.org/83230 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-11-15use icerun also for python/java/ui testsLuboš Luňák3-3/+3
Change-Id: If25c4949b999435e7a444d80a45f3dce9b8184ee Reviewed-on: https://gerrit.libreoffice.org/82715 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-23-W4 must come before -Wno-missing-braces for clang-clStephan Bergmann1-1/+1
...or else -W4 would re-enable that and cause lots of warnings/errors. 87608490f205b2fbc2b453ad8ded33050ac29b90 "filter arguments to MSVC to avoid the annoying D9025 warning" had changed the relative order of those options on the command line. Change-Id: I2ff9de93cdc6e3dc63961af61169f0adf44f7c0b Reviewed-on: https://gerrit.libreoffice.org/81403 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-15handle gracefully PCH reuse when there are no .pdb filesLuboš Luňák1-3/+8
In non-debug builds there are indeed no .pdb files to copy and reuse, and that's fine. Change-Id: I083a33ae81ac63b4e62f3a7cf0f8414996c6a843 Reviewed-on: https://gerrit.libreoffice.org/80812 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-14use common PCH for more librariesLuboš Luňák1-0/+6
Change-Id: I53164be413426691025a63cfba731cf5f9d1b7f8 Reviewed-on: https://gerrit.libreoffice.org/80790 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-14fix incorrect gb_DISABLE_PCH_REUSE testLuboš Luňák1-2/+2
Change-Id: Ife41ea7ad19c03b8dca6afe8b15d0f3b752b533b Reviewed-on: https://gerrit.libreoffice.org/80789 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-14filter out cl.exe printing source file name also when not using depsLuboš Luňák2-0/+33
This is what filter-showIncludes.awk does as a side-effect, so this is for the --disable-dependency-tracking case. Change-Id: I0fd58ff4e343c6322e9cba641acd5fa2bf3816f4 Reviewed-on: https://gerrit.libreoffice.org/80731 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-12-fstack-protector-strong is long since availableStephan Bergmann1-4/+2
...on our baselines, since <https://gcc.gnu.org/git/ ?p=gcc.git;a=commitdiff;h=b156ec373ccf27f4fcce7972de5e043d35acea43> (GCC 4.9?) and <https://github.com/llvm/llvm-project/commit/ e0fc1a80cba8b91e3943f3287e7dcf68c6bb9b7f> "[stackprotector] Add command line option -fstack-protector-strong" (Clang 3.5?) Change-Id: I48237b2304a1ee273cc66f0bb458e890a5a2f21a Reviewed-on: https://gerrit.libreoffice.org/80700 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-10Duplicate -Wno-missing-bracesStephan Bergmann1-1/+0
...ever since 9055fb48402eaeb9ba876b7893e2f9a39fea06b1 "clang-cl: Enable more warnings etc. (like in the Clang/GCC case)" Change-Id: I2c7b36f6d0852ebf6c660e79e6a9bad057ec0153 Reviewed-on: https://gerrit.libreoffice.org/80608 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-09filter out the "Creating library" message from link.exeLuboš Luňák3-1/+40
It cannot be turned off, it doesn't bring any value and it pollutes gbuild output. Change-Id: Ie3684e5fc30c9c5d34bd991e928a8d3f11f0b823 Reviewed-on: https://gerrit.libreoffice.org/80492 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-07handle more -arch: options when avoiding D9025Luboš Luňák1-2/+2
Change-Id: I97ff0418e25aeaea4cae349f2d228fb35219b5c2 Reviewed-on: https://gerrit.libreoffice.org/80374 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-07enable -Wrange-loop-analysis on clangNoel Grandin1-1/+2
Change-Id: I2095308943c94ad16c110d5fac47715398eb5d39 Reviewed-on: https://gerrit.libreoffice.org/80187 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-04enable -Wunused-exception-parameter on clangNoel Grandin1-1/+3
which is useful because our MSVC build will warn about this by default Change-Id: Idcc0f08b69b6eda4dd2ab010a5fdb674787bebcf Reviewed-on: https://gerrit.libreoffice.org/80184 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-04add gbuild function for a common PCH and use it in sc/ and sax/Luboš Luňák6-4/+28
And make it simple to disable the whole feature by setting gb_DISABLE_PCH_REUSE=1, just in case. Also work around a possible BOOST_ALL_NO_LIB mismatch when using the common PCH. Change-Id: I96fd507edf1ada6242ac225026250e5a588d0193 Reviewed-on: https://gerrit.libreoffice.org/79365 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-04support reusing PCH if linktarget has additional reasonable definesLuboš Luňák5-22/+104
Where reasonable means they are from a list of defines known not to affect the system headers, and so they are safe to differ from how the PCH was built. A bit hackish, but works in practice. Change-Id: Ia00d2e4c56212aca05ba9d47abbb0d253998219f Reviewed-on: https://gerrit.libreoffice.org/79364 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-04add gb_LinkTarget_reuse_precompiled_headerLuboš Luňák7-7/+60
Similar to gb_LinkTarget_set_precompiled_header, but uses PCH created by another linktarget. This allows using a PCH even for linktargets that are small and creating their own dedicated PCHs is not worth it. The ultimate goal is having some default PCH that will be used if no explicit PCH is set. Change-Id: I4d72acdba7181bb5c7c1cdead776f548be36ba33 Reviewed-on: https://gerrit.libreoffice.org/79362 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-04filter arguments to MSVC to avoid the annoying D9025 warningLuboš Luňák4-9/+21
GCC/Clang do not bother with warning about overriding e.g. -O2 with -O0, AFAICT it's quite a common practice, and I really don't see any good reason for the warning, and even less so for not even being able to disable it. Without this, enabling SSE2/AVX2 would warn about overriding the default -arch:SSE (that's hardcoded by configure to be part of the compiler command). Change-Id: I9f9109b77de90085486bc2a98f1b453a41755e60 Reviewed-on: https://gerrit.libreoffice.org/80123 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-04common gbuild function for getting the correct windows compilerLuboš Luňák1-6/+11
Change-Id: Ia4001a4a3a0ac8490ab7104a25ccd688d18b8aa1 Reviewed-on: https://gerrit.libreoffice.org/80122 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-04do not abort build on PCH CXXFLAGS mismatch if set explicitlyLuboš Luňák2-14/+34
All the various gb_CppunitTest_add_cxxobjects variants actually allow passing additional CXXFLAGS. However, currently that would abort the build if PCH is used, because PCH requires the same CXXFLAGS. But if those extra CXXFLAGS are set explicitly, just skip using the PCH for that one file, as the mismatch is intentional. Change-Id: Iec4eed6d5f94c3e97ee461241203a84d21e8113c Reviewed-on: https://gerrit.libreoffice.org/80120 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-04always use gb_LinkTarget__get_cxxflags for cxxobjectsLuboš Luňák1-4/+4
E.g. gb_LinkTarget_add_exception_object adds it explicitly, but gb_LinkTarget_add_cxxobject itself does not, even though other variants (c,objc,objcxx) do it. This means that when compiling tools/qa/cppunit/test_cpuid.cxx it doesn't get the correct -O/-g flags, because CppunitTest_tools_test.mk uses gb_CppunitTest_add_cxxobjects to add $(INTRINSICS_CXXFLAGS). And that in its own actually should use the add_exception_objects variant, it didn't presumably because that one used to have cxxflags passing broken until I fixed it in 4bbdab901eb3c7d32d28910fb830f4b0422eee91. The usage in Library_cpp_uno.mk even explicitly works around the lack of debug symbols. Change-Id: Idc794e95bb817cd2ba2942b8e1f04f80d6722f97 Reviewed-on: https://gerrit.libreoffice.org/80119 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-01When building with clang-cl, nevertheless use MSVC's CXXFLAGS_CXX11 for CLRStephan Bergmann1-1/+5
...which is built with MSVC after all. 0a99b5a1b7325454fe3d1174d44354888aa22012 "When building with clang-cl on Windows, build CLR code with MSVC" had happened to get away with passing a bogus -Xclang -std=... (which cl then ignores) instead of /std:c++17, but nowadays the build fails with things like > [build CLR] cli_ure/source/climaker/climaker_app.cxx [...] > cl : Command line warning D9002 : ignoring unknown option '-Xclang' > cl : Command line warning D9002 : ignoring unknown option '-std=gnu++2a' > string_view is only available with C++17 or later. > include\rtl/stringconcat.hxx(232): error C2429: attribute 'nodiscard' requires compiler flag '/std:c++17' [...] This is a bit of a hack, using hardcoded values for now. Ideally we would capture MSVC's CXXFLAGS_CXX11 in an additional variable in configure.ac, and do a subst from CXXFLAGS_CXX11 to MSVC's CXXFLAGS_CXX11 here. Change-Id: Ifde367c7d1c3db57e75a6ccadc82d534bcb13d0a Reviewed-on: https://gerrit.libreoffice.org/79961 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-01don't suggest gtk SAL_USE_VCLPLUGIN env variableCaolán McNamara1-1/+1
Change-Id: I069fc594c32d2f1ea7fe4cc04be00a9a574054f8 Reviewed-on: https://gerrit.libreoffice.org/79898 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-30drop gtk2 supportCaolán McNamara1-1/+0
Change-Id: Ie838cabfecfef7e3225c1555536d5c9cf3b43f15 Reviewed-on: https://gerrit.libreoffice.org/77405 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-09-23the PCH timestamp is actually LinkTarget's, not PCH'sLuboš Luňák3-7/+8
Because the timestamp says that the LinkTarget's PCH dependencies are ready. Change-Id: I5c9b965bf6d5a62b16972d5b0ea84a97f771e14f Reviewed-on: https://gerrit.libreoffice.org/79361 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-09-23remove unused gbuild codeLuboš Luňák1-4/+2
gb_CxxObject__set_pchflags just sets a variable, which is not used here. It should have been removed in 66a0713dc9c676182fcd7aa1e21f8dc25c05be5e, but even back then the removed function didn't depend on it, so this should have been removed even sooner. Change-Id: I629d6337d0aa4066bd3141b22aed84dfeeac5b7f Reviewed-on: https://gerrit.libreoffice.org/79315 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-09-23android: add support for 64bit buildChristian Lohmaier1-0/+15
Change-Id: Id8aae84308f6128351ae2f93c8fbc8941a0c7fc6 Reviewed-on: https://gerrit.libreoffice.org/79085 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-09-23do not require $(SRCDIR) in every gb_Library_set_precompiled_headerLuboš Luňák1-1/+1
Change-Id: I7b3a22584bb2e4d501f509ffcd80929feed23a4c Reviewed-on: https://gerrit.libreoffice.org/79360 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-09-20Replace remaining occurrences of LIBO_HEADLESS with HAVE_FEATURE_UIAndras Timar1-5/+0
Change-Id: Ie2b04ee443dece851d3d96afbc932aa64369c75c Reviewed-on: https://gerrit.libreoffice.org/79084 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-09-20Fix makefile modelinesStephan Bergmann1-2/+2
(cf. TEMPLATE.SOURCECODE.HEADER) Change-Id: I0fb78f097273b838291241ccf63c308003cac89c Reviewed-on: https://gerrit.libreoffice.org/79306 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-09-20Remove legacy NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY supportStephan Bergmann2-7/+0
...for ASan/UBSan builds using Clang older than current trunk twoards Clang 9, as announced at <https://lists.freedesktop.org/archives/libreoffice/2019-May/082654.html> "Re: [Libreoffice-commits] core.git: The -fvisibility-ms-compat hack is no longer needed for UBSan on Linux...". (And drop the no longer needed solenv/sanitizers/asan-suppressions, which people might still reference from their ASAN_OPTIONS.) Change-Id: Iedc0c5955366d2cbe7dc847990e2b1576750e85b Reviewed-on: https://gerrit.libreoffice.org/72493 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-09-09update paths to the compilerpluginLuboš Luňák2-4/+4
ceb26770b3d1c5c2ffaf73f8f589c5e169e6db06 changed the location where the clang plugin is built, but the location in the usage has not been updated. Change-Id: Ie791926c324448a950df06372b7ef8c79324748e Reviewed-on: https://gerrit.libreoffice.org/78778 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-09-06Fixing "...."Andrea Gelmini1-1/+1
Change-Id: I3424e17cfdfb563fdc5882942031deafae8689fe Reviewed-on: https://gerrit.libreoffice.org/78678 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-09-05Reduce some repeated codeMike Kaganski5-230/+230
Change-Id: I617f606b64706e8bc32e827644e5f1d1ef27702a Reviewed-on: https://gerrit.libreoffice.org/78624 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins
2019-09-02Add -latomic to the end of Linux C++ linker command linesStephan Bergmann7-8/+8
b11763dbaa0c7f427ea47abe9b98995cb49a8595 "link with -latomic on mips(el), armel, powerpc, m68k" had added -latomic to the linker command lines of just some Linux platforms (which apparently happened to actually require it). But there were three issues with that: * The -latomic came too early on the command line, so that it wasn't used to satisfy dependencies of .o files that came later. See the discussion at <https://gerrit.libreoffice.org/#/c/78319/> "set -Wl,--no-as-needed for -latomic". * There is presumably no need to include -latomic on C linker command lines. * <https://gcc.gnu.org/onlinedocs/gcc-7.3.0/libstdc++/manual/manual/using.html #manual.intro.using.flags> (matching our Linux libstdc++ 7.3.0 baseline as per README.md) states: "Linking to libatomic is required for some uses of ISO C++11 <atomic>." So we should better include -latomic on every Linux C++ linker command line that uses libstdc++. (This patch assumes that we always use libstdc++ on Linux.) Ideally we could rely on -latomic always being available with our baseline libstdc++ 7.3.0, but when using Red Hat Developer Toolset 7 that appears not to be the case, as reported by a Jenkins build for an older version of this change (see below), so use ATOMIC_LIB from the preceding commit <https://gerrit.libreoffice.org/#/c/78336/> "add -latomic configure check...". <https://ci.libreoffice.org/job/gerrit_linux_gcc_release/40298/console>: > [build LNK] Executable/unoapploader > /opt/rh/devtoolset-7/root/usr/libexec/gcc/x86_64-redhat-linux/7/ld: cannot find -latomic > collect2: error: ld returned 1 exit status > /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/solenv/gbuild/LinkTarget.mk:636: recipe for target '/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/LinkTarget/Executable/idxdict' failed This patch adds -latomic only on Linux. Similar changes can be made for other platforms if need be. Change-Id: I75df5410677f4c31c796d7ba85532bcdb47eb111 Reviewed-on: https://gerrit.libreoffice.org/78380 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-08-31Unify executables to take version resource from default.rcMike Kaganski1-1/+1
Pass file description in optional second argument to gb_Executable_add_default_nativeres. Remove duplicating version resources from officeloader.rc and launcher.rc. Change-Id: I55c4fc85c470c3dd6f03d909a39459839e70b9cd Reviewed-on: https://gerrit.libreoffice.org/78333 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-08-30Introduce gb_Executable_add_default_nativeres to add version resourceMike Kaganski1-0/+17
... to executables on Windows Change-Id: I31bd2447052915bb299820034f99128e0e97db54 Reviewed-on: https://gerrit.libreoffice.org/78290 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-08-12Fix typosAndrea Gelmini1-1/+1
Change-Id: Ia44a9dd214b5b09ed6f9c39b8057c41ae03897f1 Reviewed-on: https://gerrit.libreoffice.org/77285 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-12Fix typosAndrea Gelmini1-1/+1
Change-Id: Ic431ef6c3555f02fbc204a5b0af5f9bfe62f4a30 Reviewed-on: https://gerrit.libreoffice.org/77286 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-08-08android: support NDK 19 and above (20 as of this commit)Christian Lohmaier2-25/+1
support for targeting API 14 and 15 was removed in NDK 18, so set minimum version to 16 mips support was removed in NDK 17 Clang now takes care about correct linking with libc++ shared or static, so don't manually specify them anymore. Same with __ANDROID_API_LEVEL__ define and the sysroot / isystem handling, that is all covered by a single -target <triple><version> simplifying things quite a bit. also align ownloud sdk values with main build.gradle Change-Id: Ib3ae4484e52214677e826270b731ecf7c5c15445 Reviewed-on: https://gerrit.libreoffice.org/77104 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>