[gcc-6] 115/401: * Fix libjava testsuite with dejagnu 1.6, taken from the trunk.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit ab51e521ac12be7b57d3ff074deed95367190eed
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Apr 27 11:21:19 2016 +0000

      * Fix libjava testsuite with dejagnu 1.6, taken from the trunk.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8790 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                    |  1 +
 debian/control                      |  2 +-
 debian/control.m4                   |  2 +-
 debian/patches/dejagnu-1.6-fix.diff | 19 +++++++++++++++++++
 debian/rules.patch                  |  3 ++-
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0cf8cb0..3d2f14f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ gcc-6 (6.1.0-1) UNRELEASED; urgency=medium
   * Always configure with --enable-targets=powerpcle-linux on ppc64el.
   * Stop building libcc1 and libgccjit0, when not building common libs.
   * Rename libgccjit-5-dbg to libgccjit0-dbg.
+  * Fix libjava testsuite with dejagnu 1.6, taken from the trunk.
 
  -- Matthias Klose <doko at debian.org>  Wed, 27 Apr 2016 12:46:27 +0200
 
diff --git a/debian/control b/debian/control
index 1c3d6b7..42f2773 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian GCC Maintainers <debian-gcc at lists.debian.org>
 Uploaders: Matthias Klose <doko at debian.org>
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Build-Depends: debhelper (>= 5.0.62), dpkg-dev (>= 1.17.11), 
   g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32] <!cross>, g++-5 [arm64] <!cross>, 
   libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 mipsn32 mi [...]
diff --git a/debian/control.m4 b/debian/control.m4
index 44d25f9..1a3da3f 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -56,7 +56,7 @@ Uploaders: Iain Buclaw <ibuclaw at ubuntu.com>, Matthias Klose <doko at debian.org>
 ', `dnl
 Uploaders: Matthias Klose <doko at debian.org>
 ')dnl SRCNAME
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 ifdef(`TARGET',`dnl cross
 Build-Depends: debhelper (>= 5.0.62), DPKG_BUILD_DEP
   LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP
diff --git a/debian/patches/dejagnu-1.6-fix.diff b/debian/patches/dejagnu-1.6-fix.diff
new file mode 100644
index 0000000..333a48e
--- /dev/null
+++ b/debian/patches/dejagnu-1.6-fix.diff
@@ -0,0 +1,19 @@
+# DP: Fix libjava testsuite with dejagnu 1.6, taken from the trunk.
+
+2016-04-20  Ben Elliston  <bje at gnu.org>
+
+	* testsuite/lib/libjava.exp (libjava_arguments): Use 'file
+	normalize' rather than the defunct DejaGnu 'absolute' proc.
+
+ 
+--- a/src/libjava/testsuite/lib/libjava.exp
++++ b/src/libjava/testsuite/lib/libjava.exp
+@@ -416,7 +416,7 @@
+ 
+     # Search for libtool.  We need it to link.
+     set found_compiler 0
+-    set d [absolute $objdir]
++    set d [file normalize $objdir]
+     foreach x {. .. ../.. ../../..} {
+ 	if {[file exists $d/$x/libtool]} then {
+ 	    # We have to run silently to avoid DejaGNU lossage.
diff --git a/debian/rules.patch b/debian/rules.patch
index 91aeb63..2536dbf 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -79,7 +79,8 @@ debian_patches += \
 	pr67590 \
 	ada-gnattools-ldflags \
 	libjit-ldflags \
-	gccgo-test-linking 
+	gccgo-test-linking \
+	dejagnu-1.6-fix \
 
 # this is still needed on powerpc, e.g. firefox and insighttoolkit4 will ftbfs.
 ifneq (,$(filter $(DEB_TARGET_ARCH),powerpc))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git