summaryrefslogtreecommitdiff
path: root/debian/patches/libstdc++-test-installed.diff
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/libstdc++-test-installed.diff')
-rw-r--r--debian/patches/libstdc++-test-installed.diff14
1 files changed, 8 insertions, 6 deletions
diff --git a/debian/patches/libstdc++-test-installed.diff b/debian/patches/libstdc++-test-installed.diff
index b671fce..7784cfc 100644
--- a/debian/patches/libstdc++-test-installed.diff
+++ b/debian/patches/libstdc++-test-installed.diff
@@ -1,9 +1,11 @@
# DP: Add support to run the libstdc++-v3 testsuite using the
# DP: installed shared libraries.
+Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
+===================================================================
--- a/src/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
-@@ -38,6 +38,12 @@
+@@ -39,6 +39,12 @@
# the last thing before testing begins. This can be defined in, e.g.,
# ~/.dejagnurc or $DEJAGNU.
@@ -16,7 +18,7 @@
proc load_gcc_lib { filename } {
global srcdir
load_file $srcdir/../../gcc/testsuite/lib/$filename
-@@ -94,6 +100,7 @@
+@@ -95,6 +101,7 @@
global tool_timeout
global DEFAULT_CXXFLAGS
global STATIC_LIBCXXFLAGS
@@ -24,7 +26,7 @@
# We set LC_ALL and LANG to C so that we get the same error
# messages as expected.
-@@ -109,6 +116,9 @@
+@@ -110,6 +117,9 @@
set blddir [lookfor_file [get_multilibs] libstdc++-v3]
set flags_file "${blddir}/scripts/testsuite_flags"
@@ -34,7 +36,7 @@
set shlib_ext [get_shlib_extension]
v3track flags_file 2
-@@ -140,7 +150,11 @@
+@@ -141,7 +151,11 @@
# Locate libgcc.a so we don't need to account for different values of
# SHLIB_EXT on different platforms
@@ -47,7 +49,7 @@
if {$gccdir != ""} {
set gccdir [file dirname $gccdir]
append ld_library_path_tmp ":${gccdir}"
-@@ -149,7 +163,11 @@
+@@ -150,7 +164,11 @@
# Locate libgomp. This is only required for parallel mode.
set v3-libgomp 0
@@ -60,7 +62,7 @@
if {$libgompdir != ""} {
set v3-libgomp 1
set libgompdir [file dirname $libgompdir]
-@@ -160,7 +178,12 @@
+@@ -161,7 +179,12 @@
# Locate libstdc++ shared library. (ie libstdc++.so.)
set v3-sharedlib 0