diff --git a/gcc10-do-not-optimize-get_externals_to_pin.patch b/gcc10-do-not-optimize-get_externals_to_pin.patch new file mode 100644 index 0000000..a0b1ec6 --- /dev/null +++ b/gcc10-do-not-optimize-get_externals_to_pin.patch @@ -0,0 +1,18 @@ +diff --git a/subversion/bindings/javahl/native/SVNClient.cpp b/subversion/bindings/javahl/native/SVNClient.cpp +index 2c83f56..f1c8b02 100644 +--- a/subversion/bindings/javahl/native/SVNClient.cpp ++++ b/subversion/bindings/javahl/native/SVNClient.cpp +@@ -77,10 +77,13 @@ + #include "private/svn_subr_private.h" + #include "svn_private_config.h" + ++#pragma GCC push_options ++#pragma GCC optimize("-O0") + #include "ExternalItem.hpp" + #include "jniwrapper/jni_list.hpp" + #include "jniwrapper/jni_stack.hpp" + #include "jniwrapper/jni_string_map.hpp" ++#pragma GCC pop_options + + + SVNClient::SVNClient(jobject jthis_in) diff --git a/subversion.changes b/subversion.changes index 71ad72b..6a0af50 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 31 06:02:23 UTC 2020 - Martin Liška + +- Fix boo#1167467 by gcc10-do-not-optimize-get_externals_to_pin.patch. + ------------------------------------------------------------------- Wed Jan 8 09:59:46 UTC 2020 - Tomáš Chvátal diff --git a/subversion.spec b/subversion.spec index d7892c8..7a4c51d 100644 --- a/subversion.spec +++ b/subversion.spec @@ -62,6 +62,7 @@ Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch Patch40: subversion-perl-underlinking.patch # PATCH-FIX-UPSTREAM subversion-1.12.0-swig-4.patch -- Support Swig 4 Patch41: subversion-1.12.0-swig-4.patch +Patch42: gcc10-do-not-optimize-get_externals_to_pin.patch BuildRequires: apache-rpm-macros BuildRequires: apache2-devel >= 2.2.0 BuildRequires: apache2-prefork @@ -242,6 +243,7 @@ parameters and keywords for the svn command and other tools. %if 0%{?suse_version} > 1500 %patch41 -p1 %endif +%patch42 -p1 %build # Re-boot strap, needed for patch37