summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald van Dijk <truedfx@gentoo.org>2010-05-09 22:02:04 +0000
committerHarald van Dijk <truedfx@gentoo.org>2010-05-09 22:02:04 +0000
commit224f987dae0b9a7a2b2032843d1ebb2c900f9678 (patch)
tree91339ae3285a4538bb98ee28201f236ac3dc0bb8 /app-misc/tmux
parentFix bad copy paste made by someone... (diff)
downloadgentoo-2-224f987dae0b9a7a2b2032843d1ebb2c900f9678.tar.gz
gentoo-2-224f987dae0b9a7a2b2032843d1ebb2c900f9678.tar.bz2
gentoo-2-224f987dae0b9a7a2b2032843d1ebb2c900f9678.zip
Fix build error with et_EE locale (#318995)
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/tmux')
-rw-r--r--app-misc/tmux/ChangeLog6
-rw-r--r--app-misc/tmux/files/tmux-1.2-locale.patch22
-rw-r--r--app-misc/tmux/tmux-1.2.ebuild10
3 files changed, 35 insertions, 3 deletions
diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index 5bc34c4b71a2..605e562b2985 100644
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/tmux
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.38 2010/04/27 23:49:12 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.39 2010/05/09 22:02:04 truedfx Exp $
+
+ 09 May 2010; Harald van Dijk <truedfx@gentoo.org> tmux-1.2.ebuild,
+ +files/tmux-1.2-locale.patch:
+ Fix build error with et_EE locale (#318995)
27 Apr 2010; Tiago Cunha <tcunha@gentoo.org> tmux-1.2.ebuild:
stable sparc, bug 317535
diff --git a/app-misc/tmux/files/tmux-1.2-locale.patch b/app-misc/tmux/files/tmux-1.2-locale.patch
new file mode 100644
index 000000000000..810b10cef7a4
--- /dev/null
+++ b/app-misc/tmux/files/tmux-1.2-locale.patch
@@ -0,0 +1,22 @@
+--- tmux-1.2/GNUmakefile
++++ tmux-1.2/GNUmakefile
+@@ -56,7 +56,7 @@
+ INSTALLBIN= install -g bin -o root -m 555
+ INSTALLMAN= install -g bin -o root -m 444
+
+-SRCS= $(shell echo *.c|sed 's|osdep-[a-z0-9]*.c||g')
++SRCS= $(shell echo *.c|LC_ALL=C sed 's|osdep-[a-z0-9]*.c||g')
+ include config.mk
+ OBJS= $(patsubst %.c,%.o,$(SRCS))
+
+--- tmux-1.2/Makefile
++++ tmux-1.2/Makefile
+@@ -52,7 +52,7 @@
+ INSTALLBIN= install -g bin -o root -m 555
+ INSTALLMAN= install -g bin -o root -m 444
+
+-SRCS!= echo *.c|sed 's|osdep-[a-z0-9]*.c||g'
++SRCS!= echo *.c|LC_ALL=C sed 's|osdep-[a-z0-9]*.c||g'
+ .include "config.mk"
+ OBJS= ${SRCS:S/.c/.o/}
+
diff --git a/app-misc/tmux/tmux-1.2.ebuild b/app-misc/tmux/tmux-1.2.ebuild
index b16742ca0188..ce5dc4f6aef3 100644
--- a/app-misc/tmux/tmux-1.2.ebuild
+++ b/app-misc/tmux/tmux-1.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.2.ebuild,v 1.3 2010/04/27 23:49:12 tcunha Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.2.ebuild,v 1.4 2010/05/09 22:02:04 truedfx Exp $
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
DESCRIPTION="Terminal multiplexer"
HOMEPAGE="http://tmux.sourceforge.net"
@@ -20,6 +20,12 @@ RDEPEND="${DEPEND}
app-editors/gvim
app-editors/vim ) )"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-locale.patch
+}
+
src_compile() {
# The configure script isn't created by GNU autotools.
./configure || die "configure failed"