| 1 |
flameeyes 11/08/29 06:26:40 |
| 2 |
|
| 3 |
Modified: ChangeLog sash-3.7-r2.ebuild |
| 4 |
Log: |
| 5 |
Fix building with GCC 4.6 by not passing broken LDFLAGS (bug #381005). Do not link statically unconditionally. Use latest EAPI. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.40 app-shells/sash/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/sash/ChangeLog?rev=1.40&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/sash/ChangeLog?rev=1.40&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/sash/ChangeLog?r1=1.39&r2=1.40 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v |
| 19 |
retrieving revision 1.39 |
| 20 |
retrieving revision 1.40 |
| 21 |
diff -u -r1.39 -r1.40 |
| 22 |
--- ChangeLog 6 Feb 2011 22:02:34 -0000 1.39 |
| 23 |
+++ ChangeLog 29 Aug 2011 06:26:39 -0000 1.40 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-shells/sash |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.39 2011/02/06 22:02:34 leio Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/ChangeLog,v 1.40 2011/08/29 06:26:39 flameeyes Exp $ |
| 29 |
+ |
| 30 |
+ 29 Aug 2011; Diego E. Pettenò <flameeyes@g.o> sash-3.7-r2.ebuild: |
| 31 |
+ Fix building with GCC 4.6 by not passing broken LDFLAGS (bug #381005). Do not |
| 32 |
+ link statically unconditionally. Use latest EAPI. |
| 33 |
|
| 34 |
06 Feb 2011; Mart Raudsepp <leio@g.o> sash-3.7-r1.ebuild: |
| 35 |
Drop to ~mips |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 app-shells/sash/sash-3.7-r2.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/sash/sash-3.7-r2.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/sash/sash-3.7-r2.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-shells/sash/sash-3.7-r2.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: sash-3.7-r2.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r2.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- sash-3.7-r2.ebuild 6 Sep 2010 01:13:45 -0000 1.1 |
| 52 |
+++ sash-3.7-r2.ebuild 29 Aug 2011 06:26:39 -0000 1.2 |
| 53 |
@@ -1,10 +1,10 @@ |
| 54 |
-# Copyright 1999-2010 Gentoo Foundation |
| 55 |
+# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r2.ebuild,v 1.1 2010/09/06 01:13:45 xmw Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/sash/sash-3.7-r2.ebuild,v 1.2 2011/08/29 06:26:39 flameeyes Exp $ |
| 59 |
|
| 60 |
-EAPI=2 |
| 61 |
+EAPI=4 |
| 62 |
|
| 63 |
-inherit eutils toolchain-funcs |
| 64 |
+inherit eutils toolchain-funcs flag-o-matic |
| 65 |
|
| 66 |
DESCRIPTION="A small static UNIX Shell with readline support" |
| 67 |
HOMEPAGE="http://www.canb.auug.org.au/~dbell/ http://dimavb.st.simbirsk.su/vlk/" |
| 68 |
@@ -13,12 +13,15 @@ |
| 69 |
LICENSE="freedist" |
| 70 |
SLOT="0" |
| 71 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
| 72 |
-IUSE="readline" |
| 73 |
+IUSE="readline static" |
| 74 |
|
| 75 |
DEPEND=">=sys-libs/zlib-1.2.3 |
| 76 |
readline? ( |
| 77 |
>=sys-libs/readline-4.1 |
| 78 |
- || ( <sys-libs/ncurses-5.7-r4 >=sys-libs/ncurses-5.7-r4[static-libs] ) |
| 79 |
+ sys-libs/ncurses |
| 80 |
+ static? ( |
| 81 |
+ || ( <sys-libs/ncurses-5.7-r4 >=sys-libs/ncurses-5.7-r4[static-libs] ) |
| 82 |
+ ) |
| 83 |
)" |
| 84 |
RDEPEND="" |
| 85 |
|
| 86 |
@@ -29,17 +32,18 @@ |
| 87 |
|
| 88 |
sed -i \ |
| 89 |
-e "s:-O3:${CFLAGS}:" \ |
| 90 |
- -e "/^LDFLAGS /s: -s$: ${LDFLAGS}:" \ |
| 91 |
Makefile || die "sed failed" |
| 92 |
} |
| 93 |
|
| 94 |
src_compile() { |
| 95 |
- emake CC="$(tc-getCC)" || die |
| 96 |
+ use static && append-ldflags -static |
| 97 |
+ |
| 98 |
+ emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" |
| 99 |
} |
| 100 |
|
| 101 |
src_install() { |
| 102 |
into / |
| 103 |
- dobin sash || die |
| 104 |
- doman sash.1 || die |
| 105 |
- dodoc README || die |
| 106 |
+ dobin sash |
| 107 |
+ doman sash.1 |
| 108 |
+ dodoc README |
| 109 |
} |
Archives