From 61eea455be3ac10fa40099b811830673d18f546e Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Mon, 22 Apr 2013 11:47:47 -0300 Subject: binutils: move patches to new model On commit 5538e4766201aa0c1c23721cfc99cbbde595964b the versioned package patches changed the directory structure but the packages weren't fixed. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/binutils/2.23.1/500-sysroot.patch | 37 +++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/binutils/2.23.1/500-sysroot.patch (limited to 'package/binutils/2.23.1/500-sysroot.patch') diff --git a/package/binutils/2.23.1/500-sysroot.patch b/package/binutils/2.23.1/500-sysroot.patch new file mode 100644 index 000000000..e49c79533 --- /dev/null +++ b/package/binutils/2.23.1/500-sysroot.patch @@ -0,0 +1,37 @@ +Signed-off-by: Sven Rebhan + +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 +@@ -308,18 +308,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)) -- cgit v1.2.3