| 1 |
alonbl 13/11/29 19:29:18 |
| 2 |
|
| 3 |
Added: libksba-1.3.0-aix.patch |
| 4 |
Log: |
| 5 |
Fix aix build issue, bug#492866, thanks to Michael Haubenwallner |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key BF20DC51) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/libksba/files/libksba-1.3.0-aix.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libksba/files/libksba-1.3.0-aix.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libksba/files/libksba-1.3.0-aix.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libksba-1.3.0-aix.patch |
| 16 |
=================================================================== |
| 17 |
From 475ee015cb32010f735ea82272ce2a35701e85bf Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alon Bar-Lev <alon.barlev@×××××.com> |
| 19 |
Date: Fri, 29 Nov 2013 21:18:51 +0200 |
| 20 |
Subject: [PATCH] aix: fix conflict with sys/types.h |
| 21 |
|
| 22 |
AIX header file <sys/types.h> defines TRUE and FALSE when _ALL_SOURCE is |
| 23 |
defined, conflicts with tokens within yacc. |
| 24 |
|
| 25 |
Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=492866 |
| 26 |
Bug-Url: https://bugs.g10code.com/gnupg/issue1574 |
| 27 |
--- |
| 28 |
src/asn1-parse.c | 8 ++++++++ |
| 29 |
src/asn1-parse.y | 8 ++++++++ |
| 30 |
2 files changed, 16 insertions(+) |
| 31 |
|
| 32 |
diff --git a/src/asn1-parse.c b/src/asn1-parse.c |
| 33 |
index e84e13d..07294e7 100644 |
| 34 |
--- a/src/asn1-parse.c |
| 35 |
+++ b/src/asn1-parse.c |
| 36 |
@@ -89,6 +89,14 @@ |
| 37 |
|
| 38 |
#include "asn1-func.h" |
| 39 |
|
| 40 |
+/* aix conflict */ |
| 41 |
+#ifdef TRUE |
| 42 |
+#undef TRUE |
| 43 |
+#endif |
| 44 |
+#ifdef FALSE |
| 45 |
+#undef FALSE |
| 46 |
+#endif |
| 47 |
+ |
| 48 |
/* It would be better to make yyparse static but there is no way to do |
| 49 |
this. Let's hope that this macros works. */ |
| 50 |
#define yyparse _ksba_asn1_yyparse |
| 51 |
diff --git a/src/asn1-parse.y b/src/asn1-parse.y |
| 52 |
index eedaa0a..da8bd0c 100755 |
| 53 |
--- a/src/asn1-parse.y |
| 54 |
+++ b/src/asn1-parse.y |
| 55 |
@@ -59,6 +59,14 @@ |
| 56 |
|
| 57 |
#include "asn1-func.h" |
| 58 |
|
| 59 |
+/* aix conflict */ |
| 60 |
+#ifdef TRUE |
| 61 |
+#undef TRUE |
| 62 |
+#endif |
| 63 |
+#ifdef FALSE |
| 64 |
+#undef FALSE |
| 65 |
+#endif |
| 66 |
+ |
| 67 |
/* It would be better to make yyparse static but there is no way to do |
| 68 |
this. Let's hope that this macros works. */ |
| 69 |
#define yyparse _ksba_asn1_yyparse |
| 70 |
-- |
| 71 |
1.8.3.2 |
Archives