diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-06-24 09:24:38 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-06-24 09:24:38 +0000 |
| commit | 01f77cdf6cd2d66e6c025749c6c13c25660a9dc3 (patch) | |
| tree | 2fcbc1061c79be3e6c5a359986bf5b11992a7e0d /sys-apps/darwin-miscutils | |
| parent | Mask icu-4.2, let it fix in ~main tree first (#269659). (diff) | |
| download | gentoo-2-01f77cdf6cd2d66e6c025749c6c13c25660a9dc3.tar.gz gentoo-2-01f77cdf6cd2d66e6c025749c6c13c25660a9dc3.tar.bz2 gentoo-2-01f77cdf6cd2d66e6c025749c6c13c25660a9dc3.zip | |
Bump, fix Bus Error on 64-bits arches.
(Portage version: 2.2.00.13683-prefix/cvs/SunOS i386)
Diffstat (limited to 'sys-apps/darwin-miscutils')
| -rw-r--r-- | sys-apps/darwin-miscutils/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild (renamed from sys-apps/darwin-miscutils/darwin-miscutils-6.ebuild) | 3 | ||||
| -rw-r--r-- | sys-apps/darwin-miscutils/files/darwin-miscutils-6-w64.patch | 17 |
3 files changed, 27 insertions, 2 deletions
diff --git a/sys-apps/darwin-miscutils/ChangeLog b/sys-apps/darwin-miscutils/ChangeLog index 89ba00a949a2..05a0eaf8ddc0 100644 --- a/sys-apps/darwin-miscutils/ChangeLog +++ b/sys-apps/darwin-miscutils/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/darwin-miscutils # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/ChangeLog,v 1.1 2009/06/21 13:31:36 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/ChangeLog,v 1.2 2009/06/24 09:24:37 grobian Exp $ + +*darwin-miscutils-6-r1 (24 Jun 2009) + + 24 Jun 2009; Fabian Groffen <grobian@gentoo.org> + -darwin-miscutils-6.ebuild, +darwin-miscutils-6-r1.ebuild, + +files/darwin-miscutils-6-w64.patch: + Bump, fix Bus Error on 64-bits arches. *darwin-miscutils-6 (19 Jun 2008) diff --git a/sys-apps/darwin-miscutils/darwin-miscutils-6.ebuild b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild index 1e1caa1ddfa8..f4b56d3f5b92 100644 --- a/sys-apps/darwin-miscutils/darwin-miscutils-6.ebuild +++ b/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-6.ebuild,v 1.1 2009/06/21 13:31:36 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/darwin-miscutils/darwin-miscutils-6-r1.ebuild,v 1.1 2009/06/24 09:24:37 grobian Exp $ inherit toolchain-funcs eutils @@ -26,6 +26,7 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PN}-5-w.patch epatch "${FILESDIR}"/${PN}-5-stdlib.patch + epatch "${FILESDIR}"/${PN}-6-w64.patch cd "${S}"/developer_cmds-${DEV_VER} epatch "${FILESDIR}"/${PN}-5-error.patch } diff --git a/sys-apps/darwin-miscutils/files/darwin-miscutils-6-w64.patch b/sys-apps/darwin-miscutils/files/darwin-miscutils-6-w64.patch new file mode 100644 index 000000000000..77c194e6df9b --- /dev/null +++ b/sys-apps/darwin-miscutils/files/darwin-miscutils-6-w64.patch @@ -0,0 +1,17 @@ +grobian@gentoo.org: +The provided libresolv library is faulty for 64-bits, or this call is +doing something wrong. It is highly undocumented, so it feels like +messing around with some pointers is not going to work. Doing this in +64-bits mode, at least results in a nice Bus Error. + +--- shell_cmds-118/w/w.c ++++ shell_cmds-118/w/w.c +@@ -262,7 +262,7 @@ + argc -= optind; + argv += optind; + +-#if !TARGET_OS_EMBEDDED ++#if !defined(TARGET_OS_EMBEDDED) && !defined(__LP64__) + if (!(_res.options & RES_INIT)) + res_init(); + _res.retrans = 2; /* resolver timeout to 2 seconds per try */ |