[Libreoffice-commits] core.git: solenv/gbuild

Rene Engelhard (via logerrit) logerrit at kemper.freedesktop.org
Mon Jun 24 09:34:45 UTC 2019


 solenv/gbuild/platform/LINUX_ARM_GCC.mk     |    2 ++
 solenv/gbuild/platform/LINUX_GODSON_GCC.mk  |    2 ++
 solenv/gbuild/platform/LINUX_M68K_GCC.mk    |    2 ++
 solenv/gbuild/platform/LINUX_POWERPC_GCC.mk |    2 ++
 4 files changed, 8 insertions(+)

New commits:
commit b11763dbaa0c7f427ea47abe9b98995cb49a8595
Author:     Rene Engelhard <rene at debian.org>
AuthorDate: Sat Jun 22 09:58:29 2019 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Mon Jun 24 11:33:46 2019 +0200

    link with -latomic on mips(el), armel, powerpc, m68k
    
    needed since 0d04315c17a6df9f971237d45d9e5e8af765dd17 since it fails
    without, see
    https://buildd.debian.org/status/logs.php?pkg=libreoffice&ver=1%3A6.3.0~beta2-1&suite=experimental
    
    Change-Id: Ie91b19c0bd534b4391741388fc93494ff5a1ddf0
    Reviewed-on: https://gerrit.libreoffice.org/74554
    Tested-by: Rene Engelhard <rene at debian.org>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/solenv/gbuild/platform/LINUX_ARM_GCC.mk b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
index cccf5772b3b4..e52cf2bb8950 100644
--- a/solenv/gbuild/platform/LINUX_ARM_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
@@ -13,4 +13,6 @@ gb_COMPILEROPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/linux.mk
 
+gb_LinkTarget_LDFLAGS += -latomic
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk b/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
index 976aaedf97fe..f16f98530e2b 100644
--- a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
@@ -13,4 +13,6 @@ gb_COMPILEROPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/linux.mk
 
+gb_LinkTarget_LDFLAGS += -latomic
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/LINUX_M68K_GCC.mk b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
index 9e007101d8ac..942696f80231 100644
--- a/solenv/gbuild/platform/LINUX_M68K_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
@@ -12,4 +12,6 @@ gb_COMPILEROPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/linux.mk
 
+gb_LinkTarget_LDFLAGS += -latomic
+
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
index 1880b3bad1e4..48fa395cfada 100644
--- a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
@@ -12,4 +12,6 @@ gb_CPUDEFS += -DPPC
 
 include $(GBUILDDIR)/platform/linux.mk
 
+gb_LinkTarget_LDFLAGS += -latomic
+
 # vim: set noet sw=4:


More information about the Libreoffice-commits mailing list