diff options
author | 2017-08-24 23:24:09 (GMT) | |
---|---|---|
committer | 2017-08-24 23:24:09 (GMT) | |
commit | 1b3ed29eb9add1b9bc9773fe2565cc5af09810a8 (patch) | |
tree | 1a2693774071358985340fbbc70c3fb4fc5ba928 /packages/binutils/2.28.1/500-sysroot.patch | |
parent | 8e8417226d5cdd90896df2c585ad03a995e5e9a1 (diff) | |
parent | 961ea1938204e4fc9199c2ff5933caaa1e3d0710 (diff) |
Merge pull request #810 from stilor/fix-patching-ports
Fix patching ports
Diffstat (limited to 'packages/binutils/2.28.1/500-sysroot.patch')
-rw-r--r-- | packages/binutils/2.28.1/500-sysroot.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/packages/binutils/2.28.1/500-sysroot.patch b/packages/binutils/2.28.1/500-sysroot.patch new file mode 100644 index 0000000..4cb9bc7 --- /dev/null +++ b/packages/binutils/2.28.1/500-sysroot.patch @@ -0,0 +1,37 @@ +Signed-off-by: Sven Rebhan <odinshorse@googlemail.com> + +Always try to prepend the sysroot prefix to absolute filenames first. + +http://bugs.gentoo.org/275666 +http://sourceware.org/bugzilla/show_bug.cgi?id=10340 + +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -336,18 +336,25 @@ + directory first. */ + if (!entry->flags.maybe_archive) + { +- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) ++ /* For absolute pathnames, try to always open the file in the ++ sysroot first. If this fails, try to open the file at the ++ given location. */ ++ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); ++ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) ++ && ld_sysroot) + { + char *name = concat (ld_sysroot, entry->filename, + (const char *) NULL); + if (ldfile_try_open_bfd (name, entry)) + { + entry->filename = name; ++ entry->flags.sysrooted = TRUE; + return TRUE; + } + free (name); + } +- else if (ldfile_try_open_bfd (entry->filename, entry)) ++ ++ if (ldfile_try_open_bfd (entry->filename, entry)) + return TRUE; + + if (IS_ABSOLUTE_PATH (entry->filename)) |