diff options
Diffstat (limited to 'debian/patches/libstdc++-test-installed.diff')
| -rw-r--r-- | debian/patches/libstdc++-test-installed.diff | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/debian/patches/libstdc++-test-installed.diff b/debian/patches/libstdc++-test-installed.diff index b9e6bfd..dd7fa99 100644 --- a/debian/patches/libstdc++-test-installed.diff +++ b/debian/patches/libstdc++-test-installed.diff @@ -1,8 +1,6 @@ # 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 @@ -37,6 +37,12 @@ @@ -36,7 +34,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp set shlib_ext [get_shlib_extension] v3track flags_file 2 -@@ -151,7 +161,11 @@ proc libstdc++_init { testfile } { +@@ -154,7 +164,11 @@ proc libstdc++_init { testfile } { # Locate libgcc.a so we don't need to account for different values of # SHLIB_EXT on different platforms @@ -47,9 +45,9 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp + set gccdir [lookfor_file $tool_root_dir gcc/libgcc.a] + } if {$gccdir != ""} { - set gccdir [file dirname $gccdir] + set gccdir [file dirname $gccdir] append ld_library_path_tmp ":${gccdir}" -@@ -160,7 +174,11 @@ proc libstdc++_init { testfile } { +@@ -174,7 +188,11 @@ proc libstdc++_init { testfile } { # Locate libgomp. This is only required for parallel mode. set v3-libgomp 0 @@ -61,8 +59,8 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp + } if {$libgompdir != ""} { set v3-libgomp 1 - set libgompdir [file dirname $libgompdir] -@@ -182,7 +200,12 @@ proc libstdc++_init { testfile } { + set libgompdir [file dirname $libgompdir] +@@ -196,7 +214,12 @@ proc libstdc++_init { testfile } { # Locate libstdc++ shared library. (ie libstdc++.so.) set v3-sharedlib 0 @@ -74,5 +72,5 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp + set sharedlibdir [lookfor_file $blddir src/.libs/libstdc++.$shlib_ext] + } if {$sharedlibdir != ""} { - if { ([string match "*-*-linux*" $target_triplet] - || [string match "*-*-gnu*" $target_triplet]) + if { ([string match "*-*-gnu*" $target_triplet] + || [string match "*-*-linux*" $target_triplet] |