summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-06-28 02:37:52 +0000
committerMichał Górny <mgorny@gentoo.org>2013-06-28 02:37:52 +0000
commit5951efc07ec51fafa1b1fcbdf40ccb92a9696c83 (patch)
tree1f6eb8a7a15bcadb2ef9edb829bf2b3ec7968e6d /eclass
parentdo not fail the linker script hack when the package contains no linker script... (diff)
downloadgentoo-2-5951efc07ec51fafa1b1fcbdf40ccb92a9696c83.tar.gz
gentoo-2-5951efc07ec51fafa1b1fcbdf40ccb92a9696c83.tar.bz2
gentoo-2-5951efc07ec51fafa1b1fcbdf40ccb92a9696c83.zip
Fix redundant slashes in header-wrapping include paths, bug #475046. Thanks to Arfrever for the patch.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/multilib-build.eclass4
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index dcaed3720435..1ba0eee468e9 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.864 2013/06/23 16:36:49 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.865 2013/06/28 02:37:52 mgorny Exp $
+
+ 28 Jun 2013; Michał Górny <mgorny@gentoo.org> multilib-build.eclass:
+ Fix redundant slashes in header-wrapping include paths, bug #475046. Thanks
+ to Arfrever for the patch.
23 Jun 2013; Michael Weber <xmw@gentoo.org> +netsurf.eclass:
Add netsurf.eclass
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 224ce0db1307..a4b7c012be76 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.13 2013/05/31 17:50:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.14 2013/06/28 02:37:52 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -304,7 +304,7 @@ _EOF_
esac
# Note: match a space afterwards to avoid collision potential.
- sed -e "/${abi_flag} /s&error.*&include <${CHOST}/${f}>&" \
+ sed -e "/${abi_flag} /s&error.*&include <${CHOST}${f}>&" \
-i "${ED}/tmp/multilib-include${f}" || die
done
}