commit:     e506143656e90f7f705f9727d128d176e1700b2a
Author:     Zentaro Kavanagh <zentaro <AT> google <DOT> com>
AuthorDate: Wed Nov 16 23:21:13 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 23:21:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5061436

app-crypt/mit-krb5: fix clang build due to ttyname redecl

 .../files/mit-krb5-1.14.2-redeclared-ttyname.patch | 26 ++++++++++++++++++++++
 app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild          |  1 +
 app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild          |  1 +
 app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild          |  1 +
 4 files changed, 29 insertions(+)

diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch 
b/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch
new file mode 100644
index 00000000..a76cd3a
--- /dev/null
+++ b/app-crypt/mit-krb5/files/mit-krb5-1.14.2-redeclared-ttyname.patch
@@ -0,0 +1,26 @@
+Fixes the redeclaration of ttyname which was preventing
+enabling clang fortify.
+
+The error was;
+
+main.c:858:15: error: redeclaration of 'ttyname' must have the 'overloadable' 
attribute
+    char *p, *ttyname();
+              ^
+/build/samus/usr/include/unistd.h:784:14: note: previous overload of function 
is here
+extern char *ttyname (int __fd) __THROW __CLANG_NO_MANGLE (ttyname);
+
+https://github.com/krb5/krb5/pull/568
+
+Patch by Zentaro Kavanagh <[email protected]>
+
+--- clients/ksu/main.c
++++ clients/ksu/main.c
+@@ -855,7 +855,7 @@
+ 
+ static char * ontty()
+ {
+-    char *p, *ttyname();
++    char *p;
+     static char buf[MAXPATHLEN + 5];
+     int result;
+ 

diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild 
b/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild
index 60d7a5b..8a3c7c3 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.2.ebuild
@@ -58,6 +58,7 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
        epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
        epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+       epatch "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
 
        eautoreconf
 }

diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild 
b/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild
index 4a050dd..0a8a335 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.3.ebuild
@@ -58,6 +58,7 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
        epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
        epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+       epatch "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
 
        eautoreconf
 }

diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild 
b/app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild
index 9e30788..0eff67b 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.4.ebuild
@@ -58,6 +58,7 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
        epatch "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
        epatch "${FILESDIR}/${PN}-config_LDFLAGS.patch"
+       epatch "${FILESDIR}/${PN}-1.14.2-redeclared-ttyname.patch"
 
        # Make sure we always use the system copies.
        rm -rf util/{et,ss,verto}

Reply via email to