diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-06-26 16:23:39 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-26 16:23:39 +0000 |
| commit | ec7b100a57e3055878d9d51e6de7c0f6cc450549 (patch) | |
| tree | 85b74b5c07c976cf85a7e7a44d6d9b732804ccb1 /x11-wm | |
| parent | Mask USE=infiniband for sys-cluster/corosync (diff) | |
| download | gentoo-2-ec7b100a57e3055878d9d51e6de7c0f6cc450549.tar.gz gentoo-2-ec7b100a57e3055878d9d51e6de7c0f6cc450549.tar.bz2 gentoo-2-ec7b100a57e3055878d9d51e6de7c0f6cc450549.zip | |
Fix building on alpha (drop extra include defining it's own strlen).
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/afterstep/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-wm/afterstep/afterstep-2.2.9.ebuild | 5 | ||||
| -rw-r--r-- | x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch | 15 |
3 files changed, 23 insertions, 3 deletions
diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog index 8ddb4e2fa5a6..c5a3a5fe50af 100644 --- a/x11-wm/afterstep/ChangeLog +++ b/x11-wm/afterstep/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/afterstep # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.91 2010/06/24 09:28:21 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.92 2010/06/26 16:23:39 ssuominen Exp $ + + 26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> + afterstep-2.2.9.ebuild, +files/afterstep-2.2.9-alpha.patch: + Fix building on alpha (drop extra include defining it's own strlen). 24 Jun 2010; Christoph Mende <angelos@gentoo.org> afterstep-2.2.9.ebuild: Stable on amd64 wrt bug #306107 diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild index bdcf8437d628..e675bbb0a47c 100644 --- a/x11-wm/afterstep/afterstep-2.2.9.ebuild +++ b/x11-wm/afterstep/afterstep-2.2.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.10 2010/06/24 09:28:21 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.11 2010/06/26 16:23:39 ssuominen Exp $ EAPI=2 inherit autotools flag-o-matic eutils @@ -44,7 +44,8 @@ S=${WORKDIR}/AfterStep-${PV} src_prepare() { epatch "${FILESDIR}"/no-alternatives-${PV}.patch \ - "${FILESDIR}"/${P}-make_session_data_file.patch + "${FILESDIR}"/${P}-make_session_data_file.patch \ + "${FILESDIR}"/${P}-alpha.patch # Do not strip binaries, bug #252119 sed -e "/STRIP_BINARIES/s/-s//" \ diff --git a/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch b/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch new file mode 100644 index 000000000000..307180b9bae0 --- /dev/null +++ b/x11-wm/afterstep/files/afterstep-2.2.9-alpha.patch @@ -0,0 +1,15 @@ +libAfterStep/alpha_header.h:15: error: conflicting types for 'strlen' + +--- libAfterStep/asapp.h ++++ libAfterStep/asapp.h +@@ -15,10 +15,6 @@ + #include "sun_headers.h" + #endif + +-#if defined(__alpha) +-#include "alpha_header.h" +-#endif /* NEEDS_ALPHA_HEADER */ +- + /* Some people say that AIX and AIXV3 need 3 preceding underscores, other say + * no. I'll do both */ + #if defined ___AIX || defined _AIX || defined __QNX__ || defined ___AIXV3 || defined AIXV3 || defined _SEQUENT_
\ No newline at end of file |