diff options
author | Ulrich Müller <ulm@gentoo.org> | 2011-08-18 21:26:25 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2011-08-18 21:26:25 +0000 |
commit | aceae8686531d5fb989250da38673f209095ba60 (patch) | |
tree | ed8d7e5bc016cd1d0bfb73ac3a337c9d6e9c977c /app-editors/jasspa-microemacs | |
parent | Fix use-flag description (diff) | |
download | gentoo-2-aceae8686531d5fb989250da38673f209095ba60.tar.gz gentoo-2-aceae8686531d5fb989250da38673f209095ba60.tar.bz2 gentoo-2-aceae8686531d5fb989250da38673f209095ba60.zip |
Work around build failure on Linux 3.0.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'app-editors/jasspa-microemacs')
-rw-r--r-- | app-editors/jasspa-microemacs/ChangeLog | 8 | ||||
-rw-r--r-- | app-editors/jasspa-microemacs/files/20091011-linux3.patch | 23 | ||||
-rw-r--r-- | app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild | 5 |
3 files changed, 32 insertions, 4 deletions
diff --git a/app-editors/jasspa-microemacs/ChangeLog b/app-editors/jasspa-microemacs/ChangeLog index 172620e179dd..a9005e925892 100644 --- a/app-editors/jasspa-microemacs/ChangeLog +++ b/app-editors/jasspa-microemacs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/jasspa-microemacs -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.47 2010/10/17 15:56:16 ulm Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.48 2011/08/18 21:26:25 ulm Exp $ + + 18 Aug 2011; Ulrich Mueller <ulm@gentoo.org> +files/20091011-linux3.patch, + jasspa-microemacs-20091011-r1.ebuild: + Work around build failure on Linux 3.0. 17 Oct 2010; Ulrich Mueller <ulm@gentoo.org> jasspa-microemacs-20091011-r1.ebuild: diff --git a/app-editors/jasspa-microemacs/files/20091011-linux3.patch b/app-editors/jasspa-microemacs/files/20091011-linux3.patch new file mode 100644 index 000000000000..35a5b22a1dce --- /dev/null +++ b/app-editors/jasspa-microemacs/files/20091011-linux3.patch @@ -0,0 +1,23 @@ +Work around build failure on Linux 3.0. + +--- me091011-orig/src/build ++++ me091011/src/build +@@ -130,17 +130,7 @@ + MAKEBAS=irix6 + fi + elif [ $PLATFORM = "Linux" ] ; then +- MACHINE=`uname -m | cut -c 1-3` +- if [ $MACHINE = "arm" ] ; then +- MAKEBAS=zaurus +- else +- KERNEL_MAJOR=`uname -r | cut -c 1-1` +- KERNEL_MINOR=`uname -r | cut -c 3-3` +- MAKEBAS="linux$KERNEL_MAJOR$KERNEL_MINOR" +- if [ ! -r $MAKEBAS.gmk ] ; then +- MAKEBAS="linux2" +- fi +- fi ++ MAKEBAS=linux26 + X11_MAKELIB=/usr/X11R6/lib + elif [ $PLATFORM = "OpenBSD" ] ; then + MAKEBAS=openbsd diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild index 1ffbac753282..76b973669ce6 100644 --- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild +++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild,v 1.5 2010/10/17 15:56:16 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild,v 1.6 2011/08/18 21:26:25 ulm Exp $ EAPI=3 @@ -42,6 +42,7 @@ src_unpack() { src_prepare() { epatch "${FILESDIR}/${PV}-ncurses.patch" + epatch "${FILESDIR}/${PV}-linux3.patch" # allow for some variables to be passed to make sed -i '/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" STRIP=true/' \ |