From b2b74cdc0048889561f5e2cf628d98d7deeeea89 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Mon, 30 Apr 2007 12:03:17 +0000 Subject: [PATCH] Add patch from Fedora to make it compile on ia64 and amd64, add ~ia64 Package-Manager: portage-2.1.2.5 --- dev-libs/libnl/ChangeLog | 7 +++- dev-libs/libnl/Manifest | 34 +++++++------------ .../files/libnl-1.0_pre5-__u64_x86_64.patch | 15 ++++++++ .../files/libnl-1.0_pre6-amd64-typedef.diff | 12 ------- dev-libs/libnl/libnl-1.0_pre6.ebuild | 6 ++-- 5 files changed, 36 insertions(+), 38 deletions(-) create mode 100644 dev-libs/libnl/files/libnl-1.0_pre5-__u64_x86_64.patch delete mode 100644 dev-libs/libnl/files/libnl-1.0_pre6-amd64-typedef.diff 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 + +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 -libnl-1.0_pre5.ebuild: cleanup diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest index 033bd4411a67..5f3f9a439ab0 100644 --- a/dev-libs/libnl/Manifest +++ b/dev-libs/libnl/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX libnl-0.5.0-include.diff 364 RMD160 96898c168b8732daf8372fbda89060a24942783c SHA1 7e4a8caf005f2c15e2ea174c3f533bca67c1bd06 SHA256 ea943a86d2f7753cf0f36ee90b6ce9eb7f3b9d229fc2ca8964a62dc55d6e44db MD5 0eecf3acdb3d426c16ddfd7a398ed1a7 files/libnl-0.5.0-include.diff 364 RMD160 96898c168b8732daf8372fbda89060a24942783c files/libnl-0.5.0-include.diff 364 @@ -9,14 +6,14 @@ AUX libnl-0.5.0-libdir.patch 1050 RMD160 eca94b7395d287114e81d7b61020be0c580b521 MD5 48894de8fc4dadc72e6475da87a5fe73 files/libnl-0.5.0-libdir.patch 1050 RMD160 eca94b7395d287114e81d7b61020be0c580b521e files/libnl-0.5.0-libdir.patch 1050 SHA256 8e4d5472d4b2459f422c0dc09e67a8ec24b0e468a87e2d96be633a48a62b795c files/libnl-0.5.0-libdir.patch 1050 +AUX libnl-1.0_pre5-__u64_x86_64.patch 436 RMD160 60af2c6b04be8f604117f711f9dc3b760bde1243 SHA1 45460780670321206e2443ab3d620bf5f1534950 SHA256 e53f0726b99dc269f8f77fb507df18baa95beaf552bf3fe67705c182195db2b5 +MD5 ad0cecb08b7ee4daa7096b8e0db62fcb files/libnl-1.0_pre5-__u64_x86_64.patch 436 +RMD160 60af2c6b04be8f604117f711f9dc3b760bde1243 files/libnl-1.0_pre5-__u64_x86_64.patch 436 +SHA256 e53f0726b99dc269f8f77fb507df18baa95beaf552bf3fe67705c182195db2b5 files/libnl-1.0_pre5-__u64_x86_64.patch 436 AUX libnl-1.0_pre5-include.diff 364 RMD160 96898c168b8732daf8372fbda89060a24942783c SHA1 7e4a8caf005f2c15e2ea174c3f533bca67c1bd06 SHA256 ea943a86d2f7753cf0f36ee90b6ce9eb7f3b9d229fc2ca8964a62dc55d6e44db MD5 0eecf3acdb3d426c16ddfd7a398ed1a7 files/libnl-1.0_pre5-include.diff 364 RMD160 96898c168b8732daf8372fbda89060a24942783c files/libnl-1.0_pre5-include.diff 364 SHA256 ea943a86d2f7753cf0f36ee90b6ce9eb7f3b9d229fc2ca8964a62dc55d6e44db files/libnl-1.0_pre5-include.diff 364 -AUX libnl-1.0_pre6-amd64-typedef.diff 302 RMD160 d9abf109a0f1844802f56c7b8ff94b76f98871f0 SHA1 96c133dfca4287d42a95507bf5bb6e5b9632b689 SHA256 b7d798125c9bb566c35dfc3a2e95edb6ebf0e3c32d0db2480770bd7f5e286680 -MD5 6254441d5e718e6b92341ed0513f902b files/libnl-1.0_pre6-amd64-typedef.diff 302 -RMD160 d9abf109a0f1844802f56c7b8ff94b76f98871f0 files/libnl-1.0_pre6-amd64-typedef.diff 302 -SHA256 b7d798125c9bb566c35dfc3a2e95edb6ebf0e3c32d0db2480770bd7f5e286680 files/libnl-1.0_pre6-amd64-typedef.diff 302 AUX libnl-1.pc 184 RMD160 ca83279dd0fea90c0f03f3d28f6808e82ccb3a1f SHA1 e87c07eaea0cc0305a01e41bc6d0d1e87403d091 SHA256 36632c6a5fbfbfab28e56a3fbdbc5cf3d867c4b401481a3adc48214a78f00a70 MD5 d8e0c9170a12cf86a832f1810829016f files/libnl-1.pc 184 RMD160 ca83279dd0fea90c0f03f3d28f6808e82ccb3a1f files/libnl-1.pc 184 @@ -27,14 +24,14 @@ EBUILD libnl-0.5.0.ebuild 694 RMD160 f1147637db7c7d6c04fb752f2effa1f282345104 SH MD5 233de3f0600a9b2d8c4bfe1d4d5bc7e0 libnl-0.5.0.ebuild 694 RMD160 f1147637db7c7d6c04fb752f2effa1f282345104 libnl-0.5.0.ebuild 694 SHA256 c72ecd52991edafb9062dcee685d526c952f2d2e0adae32d4289f2ac0ca8f020 libnl-0.5.0.ebuild 694 -EBUILD libnl-1.0_pre6.ebuild 935 RMD160 3f6ce293a33b13c0a8ddd5788f8eca43093c6131 SHA1 71102825a6d33a397f5a41febbe30a79d78ab3a4 SHA256 e3a87c96b52ecc9c28b998d6f08d386161d0ed648a80b1e912bdffbce2e38375 -MD5 1b7914afce1ffb1ebd12edc81012eb63 libnl-1.0_pre6.ebuild 935 -RMD160 3f6ce293a33b13c0a8ddd5788f8eca43093c6131 libnl-1.0_pre6.ebuild 935 -SHA256 e3a87c96b52ecc9c28b998d6f08d386161d0ed648a80b1e912bdffbce2e38375 libnl-1.0_pre6.ebuild 935 -MISC ChangeLog 2306 RMD160 0651ecc7d8c471adb42aa16ee4dd57dd52e4e05b SHA1 479d5f8571eb211e356f014a89794d1f5a2bda46 SHA256 28bcda7842205af2a69083639b8d6fee5e993017610859de7c7becbe1622f220 -MD5 1d69a79b7a7aa24e42a40655075dc852 ChangeLog 2306 -RMD160 0651ecc7d8c471adb42aa16ee4dd57dd52e4e05b ChangeLog 2306 -SHA256 28bcda7842205af2a69083639b8d6fee5e993017610859de7c7becbe1622f220 ChangeLog 2306 +EBUILD libnl-1.0_pre6.ebuild 941 RMD160 c7712caad727f9f69a4869d3643d639995928ead SHA1 af2c05558ab87c24a8a50ac12de6695a45407f58 SHA256 47774d87df2da5bb7faee7bfd6af3d038031ec9b097e86f0a209c4294d914f2b +MD5 0bf223d28ac96541239797f34e7259df libnl-1.0_pre6.ebuild 941 +RMD160 c7712caad727f9f69a4869d3643d639995928ead libnl-1.0_pre6.ebuild 941 +SHA256 47774d87df2da5bb7faee7bfd6af3d038031ec9b097e86f0a209c4294d914f2b libnl-1.0_pre6.ebuild 941 +MISC ChangeLog 2541 RMD160 8e5068936ef748c396f30fdb67a27a5e63666ce4 SHA1 c269cd6be0c07cd48917d647f4c522f79c69a80f SHA256 f5ec478e0aca79cde14c877c7379494539fba7c3aa2c179bd9d9660eb4591d7f +MD5 e0a0422e56c948de582b25ed3f8c712d ChangeLog 2541 +RMD160 8e5068936ef748c396f30fdb67a27a5e63666ce4 ChangeLog 2541 +SHA256 f5ec478e0aca79cde14c877c7379494539fba7c3aa2c179bd9d9660eb4591d7f ChangeLog 2541 MISC metadata.xml 257 RMD160 31a33f71ad088fc55f06494ce46f4278383bb012 SHA1 909146c787ae6f940d598fa431d6d3c2dbcbf594 SHA256 1cfcb15424f420e1604498f361a397b5f45a29da83a51808a6a0c14a9cabe219 MD5 5731c4fdc13f68a2dccaacfbc4fbc611 metadata.xml 257 RMD160 31a33f71ad088fc55f06494ce46f4278383bb012 metadata.xml 257 @@ -45,10 +42,3 @@ SHA256 8a187a42d7b5a9ab4c71e5556ef445b8c4789cc3636ce2b6fcfd96d1d1a667d3 files/di MD5 6ce7db6a2acc13a6a3e39da63936f658 files/digest-libnl-1.0_pre6 247 RMD160 26efaaef436709cd31102ed37e38f02e45c37440 files/digest-libnl-1.0_pre6 247 SHA256 b01fdbbd8385ba92aa16391974de1c66fad7616cdb64e8208cebf00cc45fe2cf files/digest-libnl-1.0_pre6 247 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFwk5fz974XjDVpbkRAgC1AKCQ2j+ux8o8ouO0bw6jx22wdbDpoACgpBNM -eqbmNRMLCMn1RtYLk8foVvw= -=EQKL ------END PGP SIGNATURE----- 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 + #include + +-typedef uint8_t __u8; +-typedef uint16_t __u16; +-typedef uint32_t __u32; +-typedef int32_t __s32; +-typedef uint64_t __u64; ++#include + + /* local header copies */ + #include 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 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() { -- 2.26.2