summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2006-08-28 21:53:35 +0000
committerJeroen Roovers <jer@gentoo.org>2006-08-28 21:53:35 +0000
commitfdc3e57ce11aef6e0b417c34c508109def4fb6fc (patch)
tree6196e16d5f4a36fc730b8330f8f2a4f3da7bd687 /net-misc
parentAdded the make-dependencies which broke parallel building when having the as-... (diff)
downloadgentoo-2-fdc3e57ce11aef6e0b417c34c508109def4fb6fc.tar.gz
gentoo-2-fdc3e57ce11aef6e0b417c34c508109def4fb6fc.tar.bz2
gentoo-2-fdc3e57ce11aef6e0b417c34c508109def4fb6fc.zip
Apply tove's patch (bug #141452, comment #7).
(Portage version: 2.1.1_rc1-r1)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/chrony/ChangeLog6
-rw-r--r--net-misc/chrony/chrony-1.21-r1.ebuild3
-rw-r--r--net-misc/chrony/files/chrony-1.21-hppa.patch19
3 files changed, 26 insertions, 2 deletions
diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 9ae430349db1..3b1c2abf8ea9 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/chrony
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.28 2006/08/22 15:22:22 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.29 2006/08/28 21:53:34 jer Exp $
+
+ 28 Aug 2006; Jeroen Roovers <jer@gentoo.org>
+ +files/chrony-1.21-hppa.patch, chrony-1.21-r1.ebuild:
+ Apply tove's patch (bug #141452, comment #7).
22 Aug 2006; Torsten Veller <tove@gentoo.org> chrony-1.21-r1.ebuild:
Added a fix for bug #144680.
diff --git a/net-misc/chrony/chrony-1.21-r1.ebuild b/net-misc/chrony/chrony-1.21-r1.ebuild
index 446acf3384b9..fb37395ed2cc 100644
--- a/net-misc/chrony/chrony-1.21-r1.ebuild
+++ b/net-misc/chrony/chrony-1.21-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.21-r1.ebuild,v 1.2 2006/08/22 15:22:22 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.21-r1.ebuild,v 1.3 2006/08/28 21:53:35 jer Exp $
inherit eutils toolchain-funcs
@@ -38,6 +38,7 @@ src_unpack() {
io_linux.h || die "amd64 fix"
sed -i "s:/etc/chrony:/etc/chrony/chrony:g" \
chrony*.{1,5,8} faq.txt chrony.texi || die "sed failed"
+ epatch "${FILESDIR}"/${P}-hppa.patch
}
src_compile() {
diff --git a/net-misc/chrony/files/chrony-1.21-hppa.patch b/net-misc/chrony/files/chrony-1.21-hppa.patch
new file mode 100644
index 000000000000..2195f083fa63
--- /dev/null
+++ b/net-misc/chrony/files/chrony-1.21-hppa.patch
@@ -0,0 +1,19 @@
+--- io_linux.h_old 2006-08-28 20:45:52.000000000 +0200
++++ io_linux.h 2006-08-28 21:04:59.000000000 +0200
+@@ -35,6 +35,16 @@
+ #define CHRONY_IOC_READ 2U
+ #define CHRONY_IOC_WRITE 4U
+
++#elif defined(__hppa__)
++#define CHRONY_IOC_NRBITS 8
++#define CHRONY_IOC_TYPEBITS 8
++#define CHRONY_IOC_SIZEBITS 14
++#define CHRONY_IOC_DIRBITS 2
++
++#define CHRONY_IOC_NONE 0U
++#define CHRONY_IOC_WRITE 2U
++#define CHRONY_IOC_READ 1U
++
+ #else
+ #error "I don't know the values of the _IOC_* constants for your architecture"
+ #endif