diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-08-20 23:25:36 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-08-20 23:25:36 +0000 |
| commit | 0ce4bdb13516680befb266f6f6230cb22a9a5c5b (patch) | |
| tree | 223c12eb241da576bc1b55ee4345d5bf7cf46e7f /app-accessibility | |
| parent | 3.10.9 kernel version bump (diff) | |
| download | gentoo-2-0ce4bdb13516680befb266f6f6230cb22a9a5c5b.tar.gz gentoo-2-0ce4bdb13516680befb266f6f6230cb22a9a5c5b.tar.bz2 gentoo-2-0ce4bdb13516680befb266f6f6230cb22a9a5c5b.zip | |
Fix path var collisions when cross-compiling.
(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'app-accessibility')
| -rw-r--r-- | app-accessibility/brltty/ChangeLog | 6 | ||||
| -rw-r--r-- | app-accessibility/brltty/brltty-4.5-r1.ebuild | 5 | ||||
| -rw-r--r-- | app-accessibility/brltty/files/brltty-4.5-fix-mk4build-cross.patch | 21 |
3 files changed, 29 insertions, 3 deletions
diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog index f418ca2cad92..8a5091040a55 100644 --- a/app-accessibility/brltty/ChangeLog +++ b/app-accessibility/brltty/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-accessibility/brltty # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.132 2013/08/20 13:47:27 teiresias Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.133 2013/08/20 23:25:35 vapier Exp $ + + 20 Aug 2013; Mike Frysinger <vapier@gentoo.org> + +files/brltty-4.5-fix-mk4build-cross.patch, brltty-4.5-r1.ebuild: + Fix path var collisions when cross-compiling. *brltty-4.5-r1 (20 Aug 2013) diff --git a/app-accessibility/brltty/brltty-4.5-r1.ebuild b/app-accessibility/brltty/brltty-4.5-r1.ebuild index 8656ca1e9e9a..bc10d3178b7d 100644 --- a/app-accessibility/brltty/brltty-4.5-r1.ebuild +++ b/app-accessibility/brltty/brltty-4.5-r1.ebuild @@ -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/app-accessibility/brltty/brltty-4.5-r1.ebuild,v 1.1 2013/08/20 13:47:27 teiresias Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r1.ebuild,v 1.2 2013/08/20 23:25:35 vapier Exp $ EAPI=5 @@ -43,7 +43,8 @@ RDEPEND="java? ( >=virtual/jre-1.4 ) src_prepare() { epatch "${FILESDIR}"/${P}-fix-ldflags.patch \ - "${FILESDIR}"/${P}-udev.patch + "${FILESDIR}"/${P}-udev.patch \ + "${FILESDIR}"/${P}-fix-mk4build-cross.patch java-pkg-opt-2_src_prepare diff --git a/app-accessibility/brltty/files/brltty-4.5-fix-mk4build-cross.patch b/app-accessibility/brltty/files/brltty-4.5-fix-mk4build-cross.patch new file mode 100644 index 000000000000..7a516eb63a58 --- /dev/null +++ b/app-accessibility/brltty/files/brltty-4.5-fix-mk4build-cross.patch @@ -0,0 +1,21 @@ +this script generates forbuild.mk. it takes config.mk and adds a "_FOR_BUILD" +suffix to every variable it finds in there. but it only matches vars that are +all uppercase and miss things like "libdir". normally this isn't a problem as +the vars have the same value. but when you cross-compile, this script will +produce a different config.mk file which will have different paths (such as +config.mk:libdir=/usr/lib64 but forbuild.mk:libdir=/usr/lib). so update the +script to convert all vars including lowercase ones. + +Patch by Peter Nilsson Lundblad + +--- a/mk4build ++++ b/mk4build +@@ -106,7 +106,7 @@ + + sedScript="${outputName}.${sedExtension}" + sed -n -e ' +-s/^ *\([A-Z][A-Z_]*\) *=.*$/\1/ ++s/^ *\([[:alpha:]][[:alpha:]_]*\) *=.*$/\1/ + t found + d + :found |