[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects postprocess/CustomTarget_check_dynamic_objects.mk

[Michael Stahl]

 bin/check-elf-dynamic-objects                     |    7 +++++--
 postprocess/CustomTarget_check_dynamic_objects.mk |    3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 49696161be136a274d23b5704f146e0421aeb7fe
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Nov 29 21:23:44 2017 +0100

    postprocess: enable the check-elf-dynamic-objects for real
    
    Change-Id: Ie08d3dfc6306c18da7b1a5c000a75a18917c1f70
    Reviewed-on: https://gerrit.libreoffice.org/45529
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects
index a066d8f55eb9..3561b4109c78 100755
--- a/bin/check-elf-dynamic-objects
+++ b/bin/check-elf-dynamic-objects
@@ -191,8 +191,11 @@ else
     wait
 
     if [ -s check_elf.out ] ; then
-	cat check_elf.out
-	status=1
+        cat check_elf.out
+        # FIXME known broken, ignore for now
+        if grep -v 'libgpgmepp.so.6\|libgpgme.so.11\|libassuan.so.0' check_elf.out >/dev/null; then
+            status=1
+        fi
     fi
     rm check_elf.out
 fi
diff --git a/postprocess/CustomTarget_check_dynamic_objects.mk b/postprocess/CustomTarget_check_dynamic_objects.mk
index 53baa2bfd92f..aedf589eb51e 100644
--- a/postprocess/CustomTarget_check_dynamic_objects.mk
+++ b/postprocess/CustomTarget_check_dynamic_objects.mk
@@ -19,7 +19,6 @@ $(call gb_CustomTarget_get_workdir,postprocess/check_dynamic_objects)/check.done
 		$(call gb_Postprocess_get_target,AllPackages)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,2)
 	# currently we only check ELF objects
-	# FIXME fails currently, disabled
-	$(SRCDIR)/bin/check-elf-dynamic-objects -p || true
+	$(SRCDIR)/bin/check-elf-dynamic-objects -p
 
 # vim: set noet sw=4 ts=4: