Date: Fri, 19 May 2017 22:30:16 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441276 - head/editors/libreoffice/files Message-ID: <201705192230.v4JMUGp0058313@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Fri May 19 22:30:16 2017 New Revision: 441276 URL: https://svnweb.freebsd.org/changeset/ports/441276 Log: Work around sporadic build failures. Added: head/editors/libreoffice/files/patch-chart2_Module__chart2.mk (contents, props changed) Modified: head/editors/libreoffice/files/patch-sc_Module__sc.mk head/editors/libreoffice/files/patch-sw_Module__sw.mk Added: head/editors/libreoffice/files/patch-chart2_Module__chart2.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/libreoffice/files/patch-chart2_Module__chart2.mk Fri May 19 22:30:16 2017 (r441276) @@ -0,0 +1,12 @@ +--- chart2/Module_chart2.mk.orig 2017-05-03 16:46:29 UTC ++++ chart2/Module_chart2.mk +@@ -30,7 +30,8 @@ $(eval $(call gb_Module_add_check_targets,chart2,\ + )) + + $(eval $(call gb_Module_add_slowcheck_targets,chart2,\ +- CppunitTest_chart2_export \ ++ $(if $(filter FREEBSD,$(OS)),, \ ++ CppunitTest_chart2_export) \ + CppunitTest_chart2_import \ + CppunitTest_chart2_trendcalculators \ + )) Modified: head/editors/libreoffice/files/patch-sc_Module__sc.mk ============================================================================== --- head/editors/libreoffice/files/patch-sc_Module__sc.mk Fri May 19 22:22:50 2017 (r441275) +++ head/editors/libreoffice/files/patch-sc_Module__sc.mk Fri May 19 22:30:16 2017 (r441276) @@ -1,6 +1,16 @@ --- sc/Module_sc.mk.orig 2017-05-03 16:46:29 UTC +++ sc/Module_sc.mk -@@ -60,8 +60,9 @@ endif +@@ -45,7 +45,8 @@ $(eval $(call gb_Module_add_check_targets,sc,\ + $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ + CppunitTest_sc_ucalc) \ + CppunitTest_sc_bugfix_test \ +- CppunitTest_sc_filters_test \ ++ $(if $(filter FREEBSD,$(OS)),, \ ++ CppunitTest_sc_filters_test) \ + CppunitTest_sc_rangelst_test \ + CppunitTest_sc_mark_test \ + CppunitTest_sc_core \ +@@ -60,8 +61,9 @@ endif $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_condformats \ CppunitTest_sc_new_cond_format_api \ @@ -12,7 +22,7 @@ CppunitTest_sc_html_export_test \ CppunitTest_sc_opencl_test \ CppunitTest_sc_copypaste \ -@@ -71,7 +72,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \ +@@ -71,7 +73,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \ # point weirdness (x87, registers, compiler optimization, ... whatever), # disable them until someone finds a real cure. Modified: head/editors/libreoffice/files/patch-sw_Module__sw.mk ============================================================================== --- head/editors/libreoffice/files/patch-sw_Module__sw.mk Fri May 19 22:22:50 2017 (r441275) +++ head/editors/libreoffice/files/patch-sw_Module__sw.mk Fri May 19 22:30:16 2017 (r441276) @@ -1,8 +1,14 @@ --- sw/Module_sw.mk.orig 2017-05-03 16:46:29 UTC +++ sw/Module_sw.mk -@@ -55,23 +55,28 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ - CppunitTest_sw_ooxmlexport \ - CppunitTest_sw_ooxmlexport2 \ +@@ -52,26 +52,33 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\ + CppunitTest_sw_htmlexport \ + CppunitTest_sw_htmlimport \ + CppunitTest_sw_macros_test \ +- CppunitTest_sw_ooxmlexport \ +- CppunitTest_sw_ooxmlexport2 \ ++ $(if $(filter FREEBSD,$(OS)),, \ ++ CppunitTest_sw_ooxmlexport \ ++ CppunitTest_sw_ooxmlexport2) \ CppunitTest_sw_ooxmlexport3 \ - CppunitTest_sw_ooxmlexport4 \ + $(if $(filter FREEBSD,$(OS)),, \ @@ -26,7 +32,9 @@ + CppunitTest_sw_ww8import) \ CppunitTest_sw_rtfexport \ CppunitTest_sw_rtfimport \ - CppunitTest_sw_odfexport \ +- CppunitTest_sw_odfexport \ ++ $(if $(filter FREEBSD,$(OS)),, \ ++ CppunitTest_sw_odfexport) \ CppunitTest_sw_odfimport \ - CppunitTest_sw_uiwriter \ + $(if $(filter FREEBSD,$(OS)),, \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705192230.v4JMUGp0058313>