1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
|
From 25995151a62e62ba1d3c6a73c9c1cc328e7daa6e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@debian.org>
Date: Wed, 3 Sep 2014 22:41:55 -0400
Subject: Use -isystem for include paths
This is necessary so Kerberos headers files are classified as "system headers"
by the compiler, and thus not subject to the same strict warnings as
other headers (which breaks compilation if -Werror is specified).
.
This fixes the build of folks using -Werror and including Kerberos headers
when the latter are installed in a non-standard location (e.g.
/usr/include/tuple/mit-krb5, as Debian is doing).
(cherry picked from commit d8520c1d1c218e3c766009abc728b207c0421232)
Author: Jelmer Vernooij <jelmer@debian.org>
Bug-Debian: http://bugs.debian.org/751760
Patch-Category: debian-local
---
src/build-tools/gssrpc.pc.in | 2 +-
src/build-tools/kadm-client.pc.in | 2 +-
src/build-tools/kadm-server.pc.in | 2 +-
src/build-tools/kdb.pc.in | 2 +-
src/build-tools/krb5-config.in | 2 +-
src/build-tools/mit-krb5-gssapi.pc.in | 2 +-
src/build-tools/mit-krb5.pc.in | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/build-tools/gssrpc.pc.in b/src/build-tools/gssrpc.pc.in
index e08c2e840a..fb4f489f87 100644
--- a/src/build-tools/gssrpc.pc.in
+++ b/src/build-tools/gssrpc.pc.in
@@ -7,6 +7,6 @@ vendor=MIT
Name: gssrpc
Description: GSSAPI RPC implementation
Version: @KRB5_VERSION@
-Cflags: -I${includedir}
+Cflags: -isystem ${includedir}
Libs: -L${libdir} -lgssrpc
Requires.private: mit-krb5-gssapi
diff --git a/src/build-tools/kadm-client.pc.in b/src/build-tools/kadm-client.pc.in
index de56a75213..47541ac2af 100644
--- a/src/build-tools/kadm-client.pc.in
+++ b/src/build-tools/kadm-client.pc.in
@@ -7,5 +7,5 @@ Name: kadm-client
Description: Kerberos administration client library
Version: @KRB5_VERSION@
Requires.private: mit-krb5-gssapi gssrpc
-Cflags: -I${includedir}
+Cflags: -isystem ${includedir}
Libs: -L${libdir} -lkadm5clnt_mit
diff --git a/src/build-tools/kadm-server.pc.in b/src/build-tools/kadm-server.pc.in
index a73ff86cfe..5ce4b733c4 100644
--- a/src/build-tools/kadm-server.pc.in
+++ b/src/build-tools/kadm-server.pc.in
@@ -7,5 +7,5 @@ Name: kadm-server
Description: Kerberos administration server library
Version: @KRB5_VERSION@
Requires.private: kdb mit-krb5-gssapi
-Cflags: -I${includedir}
+Cflags: -isystem ${includedir}
Libs: -L${libdir} -lkadm5srv_mit
diff --git a/src/build-tools/kdb.pc.in b/src/build-tools/kdb.pc.in
index 356501d38c..d39eeef889 100644
--- a/src/build-tools/kdb.pc.in
+++ b/src/build-tools/kdb.pc.in
@@ -9,6 +9,6 @@ Name: kdb
Description: Kerberos database access libraries
Version: @KRB5_VERSION@
Requires.private: mit-krb5-gssapi mit-krb5 gssrpc
-Cflags: -I${includedir}
+Cflags: -isystem ${includedir}
Libs: -L${libdir} -lkdb5
Libs.private: ${KDB5_DB_LIB}
diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in
index ac2f5827d3..010457e153 100755
--- a/src/build-tools/krb5-config.in
+++ b/src/build-tools/krb5-config.in
@@ -208,7 +208,7 @@ fi
if test -n "$do_cflags"; then
if test x"$includedir" != x"/usr/include" ; then
- echo "-I${includedir}"
+ echo "-isystem ${includedir}"
else
echo ''
fi
diff --git a/src/build-tools/mit-krb5-gssapi.pc.in b/src/build-tools/mit-krb5-gssapi.pc.in
index b2b243630c..f919222699 100644
--- a/src/build-tools/mit-krb5-gssapi.pc.in
+++ b/src/build-tools/mit-krb5-gssapi.pc.in
@@ -7,5 +7,5 @@ Name: mit-krb5-gssapi
Description: Kerberos implementation of the GSSAPI
Version: @KRB5_VERSION@
Requires.private: mit-krb5
-Cflags: -I${includedir}
+Cflags: -isystem ${includedir}
Libs: -L${libdir} -lgssapi_krb5
diff --git a/src/build-tools/mit-krb5.pc.in b/src/build-tools/mit-krb5.pc.in
index 058e75f24d..455427a42e 100644
--- a/src/build-tools/mit-krb5.pc.in
+++ b/src/build-tools/mit-krb5.pc.in
@@ -10,6 +10,6 @@ defcktname=@DEFCKTNAME@
Name: mit-krb5
Description: An implementation of Kerberos network authentication
Version: @KRB5_VERSION@
-Cflags: -I${includedir}
+Cflags: -isystem ${includedir}
Libs: -L${libdir} -lkrb5 -lk5crypto -lcom_err
Libs.private: -lkrb5support
|
