diff options
| -rw-r--r-- | dev-libs/libnl/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch | 15 | ||||
| -rw-r--r-- | dev-libs/libnl/files/libnl-1.0_pre6-amd64-typedef.diff | 12 | ||||
| -rw-r--r-- | dev-libs/libnl/libnl-1.0_pre6.ebuild | 6 |
4 files changed, 24 insertions, 16 deletions
diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog index e8c36ea38f45..7d1ef810dfd7 100644 --- a/dev-libs/libnl/ChangeLog +++ b/dev-libs/libnl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libnl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.16 2007/02/01 20:32:52 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.17 2007/04/30 12:03:17 armin76 Exp $ + + 30 Apr 2007; Raúl Porcel <armin76@gentoo.org> + +files/libnl-1.0_pre5-__u64_x86_64.patch, + -files/libnl-1.0_pre6-amd64-typedef.diff, libnl-1.0_pre6.ebuild: + Add patch from Fedora to make it compile on ia64 and amd64, add ~ia64 01 Feb 2007; Markus Ullmann <jokey@gentoo.org> -libnl-1.0_pre5.ebuild: cleanup diff --git a/dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch b/dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch new file mode 100644 index 000000000000..ffa61a182e4f --- /dev/null +++ b/dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch @@ -0,0 +1,15 @@ +--- libnl-1.0-pre5/include/netlink-local.h.__u64_x86_64 2005-11-02 12:29:06.000000000 -0500 ++++ libnl-1.0-pre5/include/netlink-local.h 2006-05-26 20:09:28.000000000 -0400 +@@ -30,11 +30,7 @@ + #include <arpa/inet.h> + #include <netdb.h> + +-typedef uint8_t __u8; +-typedef uint16_t __u16; +-typedef uint32_t __u32; +-typedef int32_t __s32; +-typedef uint64_t __u64; ++#include <asm/types.h> + + /* local header copies */ + #include <linux/if.h> diff --git a/dev-libs/libnl/files/libnl-1.0_pre6-amd64-typedef.diff b/dev-libs/libnl/files/libnl-1.0_pre6-amd64-typedef.diff deleted file mode 100644 index 5f4dff9b26c4..000000000000 --- a/dev-libs/libnl/files/libnl-1.0_pre6-amd64-typedef.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- /libnl-1.0_pre6.orig/include/netlink-local.h -+++ /libnl-1.0_pre6/include/netlink-local.h -@@ -34,7 +34,8 @@ - typedef uint16_t __u16; - typedef uint32_t __u32; - typedef int32_t __s32; --typedef uint64_t __u64; -+typedef unsigned long long __u64; -+ - - /* local header copies */ - #include <linux/if.h> diff --git a/dev-libs/libnl/libnl-1.0_pre6.ebuild b/dev-libs/libnl/libnl-1.0_pre6.ebuild index d2b369119228..1791cea53de3 100644 --- a/dev-libs/libnl/libnl-1.0_pre6.ebuild +++ b/dev-libs/libnl/libnl-1.0_pre6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.0_pre6.ebuild,v 1.3 2007/01/14 11:07:20 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.0_pre6.ebuild,v 1.4 2007/04/30 12:03:17 armin76 Exp $ inherit eutils multilib linux-info @@ -9,7 +9,7 @@ HOMEPAGE="http://people.suug.ch/~tgr/libnl/" SRC_URI="http://dev.gentoo.org/~steev/distfiles/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" IUSE="" src_unpack() { @@ -19,7 +19,7 @@ src_unpack() { cd ${S}/include sed -i Makefile -e 's:install -o root -g root:install:g' epatch "${FILESDIR}/${PN}-1.0_pre5-include.diff" - epatch "${FILESDIR}/${PN}-1.0_pre6-amd64-typedef.diff" + epatch "${FILESDIR}/${PN}-1.0_pre5-__u64_x86_64.patch" } src_install() { |