summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2013-06-17 10:33:28 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2013-06-17 10:33:28 +0000
commitcede1cf46d35c2036c1799def5ff79b530b705c9 (patch)
tree2958f693ccf3c7466c71f7f5decaae48cd07060e /net-libs/gnutls/files
parentAdd blocker dependency for app-arch/par as a workaround for bug #455838 (diff)
downloadhistorical-cede1cf46d35c2036c1799def5ff79b530b705c9.tar.gz
historical-cede1cf46d35c2036c1799def5ff79b530b705c9.tar.bz2
historical-cede1cf46d35c2036c1799def5ff79b530b705c9.zip
fix hppa build issue, bug#471914, again... there is duplicate file
Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64 Manifest-Sign-Key: 0xBF20DC51
Diffstat (limited to 'net-libs/gnutls/files')
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-hppa.patch38
1 files changed, 35 insertions, 3 deletions
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch b/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch
index 3ae5be8be3ca..16981cf2e91b 100644
--- a/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch
+++ b/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch
@@ -1,6 +1,22 @@
-diff -urNp gnutls-2.12.23/gl/tests/test-fcntl-h.c gnutls-2.12.23.new/gl/tests/test-fcntl-h.c
---- gnutls-2.12.23/gl/tests/test-fcntl-h.c 2012-11-11 05:16:55.000000000 +0200
-+++ gnutls-2.12.23.new/gl/tests/test-fcntl-h.c 2013-06-16 01:31:28.315827891 +0300
+From 043fe2c28a5f6b3ec6202090faaf7933b247e40c Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Mon, 17 Jun 2013 13:27:55 +0300
+Subject: [PATCH] build: fix hppa compile
+
+gentoo#471914
+
+O_SYNC : 262144
+O_DSYNC: 262144
+O_RSYNC: 524288
+---
+ gl/tests/test-fcntl-h.c | 2 +-
+ lib/gl/tests/test-fcntl-h.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gl/tests/test-fcntl-h.c b/gl/tests/test-fcntl-h.c
+index a6c9621..9e13491 100644
+--- a/gl/tests/test-fcntl-h.c
++++ b/gl/tests/test-fcntl-h.c
@@ -111,7 +111,7 @@ main (void)
#if O_RSYNC && O_RSYNC != O_DSYNC
case O_RSYNC:
@@ -10,3 +26,19 @@ diff -urNp gnutls-2.12.23/gl/tests/test-fcntl-h.c gnutls-2.12.23.new/gl/tests/te
case O_SYNC:
#endif
#if O_TTY_INIT
+diff --git a/lib/gl/tests/test-fcntl-h.c b/lib/gl/tests/test-fcntl-h.c
+index a6c9621..9e13491 100644
+--- a/lib/gl/tests/test-fcntl-h.c
++++ b/lib/gl/tests/test-fcntl-h.c
+@@ -111,7 +111,7 @@ main (void)
+ #if O_RSYNC && O_RSYNC != O_DSYNC
+ case O_RSYNC:
+ #endif
+-#if O_SYNC && O_SYNC != O_RSYNC
++#if O_SYNC && O_SYNC != O_RSYNC && O_SYNC != O_DSYNC
+ case O_SYNC:
+ #endif
+ #if O_TTY_INIT
+--
+1.8.1.5
+