From 8993f246c593e78038f7422c24897bfd16348945 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Tue, 10 Jun 2008 22:05:00 +0000
Subject: gcc 4.3.0: replace with gcc 4.3.1

---
 .../gcc-4.3.1/debian/libjava-nobiarch-check.dpatch | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 packages/gcc/gcc-4.3.1/debian/libjava-nobiarch-check.dpatch

(limited to 'packages/gcc/gcc-4.3.1/debian/libjava-nobiarch-check.dpatch')

diff --git a/packages/gcc/gcc-4.3.1/debian/libjava-nobiarch-check.dpatch b/packages/gcc/gcc-4.3.1/debian/libjava-nobiarch-check.dpatch
new file mode 100644
index 0000000000..b32e1050a2
--- /dev/null
+++ b/packages/gcc/gcc-4.3.1/debian/libjava-nobiarch-check.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+
+# DP: For biarch builds, disable the testsuite for the non-default architecture
+# DP: for runtime libraries, which are not built by default (libjava).
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- libjava/testsuite/Makefile.in~	2005-09-29 23:53:39.213898000 +0200
++++ libjava/testsuite/Makefile.in	2005-09-29 23:55:33.382541760 +0200
+@@ -346,12 +346,14 @@
+ 
+ 
+ check-DEJAGNU: site.exp
++	runtestflags="`echo '$(RUNTESTFLAGS)' | sed 's/,-m[36][24]//'`"; \
++	case "$$runtestflags" in *\\{\\}) runtestflags=; esac; \
+ 	srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
+ 	EXPECT=$(EXPECT); export EXPECT; \
+ 	runtest=$(RUNTEST); \
+ 	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+ 	  l='$(DEJATOOL)'; for tool in $$l; do \
+-	    $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
++	    $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $$runtestflags; \
+ 	  done; \
+ 	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
+ 	fi
-- 
cgit v1.2.3