diff options
Diffstat (limited to 'debian/patches/libjava-nobiarch-check.diff')
| -rw-r--r-- | debian/patches/libjava-nobiarch-check.diff | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/debian/patches/libjava-nobiarch-check.diff b/debian/patches/libjava-nobiarch-check.diff new file mode 100644 index 0000000..6aa4045 --- /dev/null +++ b/debian/patches/libjava-nobiarch-check.diff @@ -0,0 +1,27 @@ +# DP: For biarch builds, disable the testsuite for the non-default architecture +# DP: for runtime libraries, which are not built by default (libjava). + +--- + libjava/testsuite/Makefile.in | 4 +++- + 2 files changed, 25 insertions(+), 1 deletions(-) + +Index: b/src/libjava/testsuite/Makefile.in +=================================================================== +--- a/src/libjava/testsuite/Makefile.in ++++ b/src/libjava/testsuite/Makefile.in +@@ -406,12 +406,14 @@ CTAGS: + + + check-DEJAGNU: site.exp ++ runtestflags="`echo '$(RUNTESTFLAGS)' | sed -r 's/,-m(32|64|x32)//g;s/,-mabi=(n32|64)//g'`"; \ ++ case "$$runtestflags" in *\\{\\}) runtestflags=; esac; \ + srcdir='$(srcdir)'; export srcdir; \ + EXPECT=$(EXPECT); export EXPECT; \ + runtest=$(RUNTEST); \ + if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ + exit_status=0; l='$(DEJATOOL)'; for tool in $$l; do \ +- if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ ++ if $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $$runtestflags; \ + then :; else exit_status=1; fi; \ + done; \ + else echo "WARNING: could not find \`runtest'" 1>&2; :;\ |