diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-10-07 07:43:39 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-10-07 07:43:39 +0000 |
| commit | f9e0471f7607a524f987183e39d0a4cf25b8eac8 (patch) | |
| tree | 65c33bcae246e2c7420aecede86c07f82c4c3fbd | |
| parent | Depend on sptk-3.5* specifically (diff) | |
| download | historical-f9e0471f7607a524f987183e39d0a4cf25b8eac8.tar.gz historical-f9e0471f7607a524f987183e39d0a4cf25b8eac8.tar.bz2 historical-f9e0471f7607a524f987183e39d0a4cf25b8eac8.zip | |
Fix build with glibc-2.10 Bug #286532
Package-Manager: portage-2.1.6.13/cvs/Linux i686
| -rw-r--r-- | games-roguelike/nethack/ChangeLog | 6 | ||||
| -rw-r--r-- | games-roguelike/nethack/Manifest | 5 | ||||
| -rw-r--r-- | games-roguelike/nethack/files/nethack-3.4.3-gibc210.patch | 13 | ||||
| -rw-r--r-- | games-roguelike/nethack/nethack-3.4.3-r1.ebuild | 14 |
4 files changed, 28 insertions, 10 deletions
diff --git a/games-roguelike/nethack/ChangeLog b/games-roguelike/nethack/ChangeLog index 77788aaa301d..9b3480267bcf 100644 --- a/games-roguelike/nethack/ChangeLog +++ b/games-roguelike/nethack/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-roguelike/nethack # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.31 2009/09/23 17:40:47 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/ChangeLog,v 1.32 2009/10/07 07:43:39 tupone Exp $ + + 07 Oct 2009; Tupone Alfredo <tupone@gentoo.org> + +files/nethack-3.4.3-gibc210.patch, nethack-3.4.3-r1.ebuild: + Fix build with glibc-2.10 Bug #286532 by Andrew Savchenko 23 Sep 2009; Patrick Lauer <patrick@gentoo.org> nethack-3.4.3-r1.ebuild: Remove virtual/libc diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest index 4aecc0168527..19374f1ac34a 100644 --- a/games-roguelike/nethack/Manifest +++ b/games-roguelike/nethack/Manifest @@ -5,7 +5,8 @@ AUX 3.4.3-default-options.patch 1262 RMD160 10bdb2cbe10a7396a8f88052d6a61e62629c AUX 3.4.3-gentoo-paths.patch 576 RMD160 84319d80353e1c029d4130a73ae65b18680f2c91 SHA1 b8cc137b8b5c04071d81c741635fd261250490b6 SHA256 09b96c2659aab5749e5f16ceedfba40597938c9aa06e6bfc05e6b5f029a2ffb1 AUX 3.4.3-macos.patch 307 RMD160 460ef1f4279e5c0e09de3cfe77b7984fbab0dede SHA1 a96ef11b97a9cbf08c9207144986d4355a27e6b1 SHA256 2df99fde20c8ff4b919da95bb4a36222b9eac564cfc2e02233da95dcbc25bb17 AUX dot.nethackrc 2717 RMD160 0e9868a1b8f017337d8c37e740399e25512bdb5b SHA1 27c973b8c336355012e2e2c4f0007bce9cce9f84 SHA256 19d692014e1b053439f5f818291e32a971942490ca7e3d2b7912b43a4563f98c +AUX nethack-3.4.3-gibc210.patch 330 RMD160 18a1bca6e71c7dc7930039fcb330f0c1791e31ce SHA1 45663beda1b67529886f1839f96be45021623c54 SHA256 5c74be994e8c5622b0c97f6178ef123ef614c9a1e2b4005da7fd36692f1df47e DIST nethack-343-src.tgz 3497458 RMD160 42f600d24715a0b7e631b357c135761410b3ca95 SHA1 c26537093c38152bc0fbcec20468d975b35f59fd SHA256 bb39c3d2a9ee2df4a0c8fdde708fbc63740853a7608d2f4c560b488124866fe4 -EBUILD nethack-3.4.3-r1.ebuild 5014 RMD160 7df329bf50abefdb1c56319e8b79c19e055d33c1 SHA1 5dbd8ab35eac4a53edba233fd4dc842e182e7fdc SHA256 3cae3e26cf1f53c1ee4155a602cc443f9721cde5e0c7cec381f50b6e1082bee1 -MISC ChangeLog 6827 RMD160 616659d792dd4dea289261b8f93b550187c68851 SHA1 da7892d2530b9c92c3a59e5a41898b753b947c86 SHA256 a89a46b02d8c3025e946d11a274fb1ff32a71c438d15d1c2bedb40eb4dbf86c4 +EBUILD nethack-3.4.3-r1.ebuild 5038 RMD160 31abda0528a4a5280b451b6f5a3cc9422c68df8b SHA1 7784d75db6451967e47fd3f12abcbbaf705ae276 SHA256 6b85080ba3d04a121d874694a646418a71cc24733983a5bc92c8f307e89d16ce +MISC ChangeLog 7000 RMD160 192ba217e5dc07af46c449e6b452c08e7883908a SHA1 1854fd1e343808d924c28ca938b3d2ef6fa24f1e SHA256 1b9ed6fb158f1296ddf6b35c6e644696e6dfd59625d92c92e3ff1e7271911e97 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-roguelike/nethack/files/nethack-3.4.3-gibc210.patch b/games-roguelike/nethack/files/nethack-3.4.3-gibc210.patch new file mode 100644 index 000000000000..20675cabf4b4 --- /dev/null +++ b/games-roguelike/nethack/files/nethack-3.4.3-gibc210.patch @@ -0,0 +1,13 @@ +--- include/unixconf.h.old 2009-10-07 09:37:46.000000000 +0200 ++++ include/unixconf.h 2009-10-07 09:38:05.000000000 +0200 +@@ -293,10 +293,8 @@ + # endif + #else /* therefore SYSV */ + # ifndef index /* some systems seem to do this for you */ +-#define index strchr + # endif + # ifndef rindex +-#define rindex strrchr + # endif + #endif + diff --git a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild index 4a0c5feb1bca..ad205862b1cb 100644 --- a/games-roguelike/nethack/nethack-3.4.3-r1.ebuild +++ b/games-roguelike/nethack/nethack-3.4.3-r1.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.24 2009/09/23 17:40:47 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-roguelike/nethack/nethack-3.4.3-r1.ebuild,v 1.25 2009/10/07 07:43:39 tupone Exp $ +EAPI=2 inherit eutils toolchain-funcs flag-o-matic games @@ -31,20 +32,19 @@ DEPEND="${RDEPEND} HACKDIR="${GAMES_DATADIR}/${PN}" -src_unpack() { - unpack ${A} - +src_prepare() { # This copies the /sys/unix Makefile.*s to their correct places for # seding and compiling. - cd "${S}/sys/unix" + cd "sys/unix" source setup.sh || die - cd "${S}" + cd ../.. epatch \ "${FILESDIR}"/${PV}-gentoo-paths.patch \ "${FILESDIR}"/${PV}-default-options.patch \ "${FILESDIR}"/${PV}-bison.patch \ - "${FILESDIR}"/${PV}-macos.patch + "${FILESDIR}"/${PV}-macos.patch \ + "${FILESDIR}"/${P}-gibc210.patch sed -i \ -e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" include/unixconf.h \ |