d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use ${SRCTOP}/contrib/com_err/com_err.h instead of the installed com_err.h.

Browse Source 
This fixes build when com_err.h is not installed.

PR:		234691
MFC after:	1 week
This commit is contained in:
nyan 2019-01-14 06:34:54 +00:00
parent 588957c4ea
commit 9bfb656b5b
20 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kerberos5/lib/libasn1/Makefile
View File

@ -21,7 +21,8 @@ SRCS= asn1_err.c \
timegm.c \ timegm.c \
${GEN:S/.x$/.c/:S/.hx$/.h/} ${GEN:S/.x$/.c/:S/.hx$/.h/}
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I${SRCTOP}/contrib/com_err -I.
GEN_RFC2459= asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx GEN_RFC2459= asn1_rfc2459_asn1.x rfc2459_asn1.hx rfc2459_asn1-priv.hx
GEN_CMS= asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx GEN_CMS= asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx

4
kerberos5/lib/libgssapi_krb5/Makefile
View File

@ -78,7 +78,9 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5
CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
CFLAGS+=-I${KRB5DIR}/lib/krb5 CFLAGS+=-I${KRB5DIR}/lib/krb5
CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/asn1
CFLAGS+=-I${KRB5DIR}/lib/roken -I. CFLAGS+=-I${KRB5DIR}/lib/roken
CFLAGS+=-I${SRCTOP}/contrib/com_err
CFLAGS+=-I.
.include <bsd.lib.mk> .include <bsd.lib.mk>

1
kerberos5/lib/libhdb/Makefile
View File

@ -59,6 +59,7 @@ SRCS= common.c \
CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \ -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \
-I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/krb5 \
-I${SRCTOP}/contrib/com_err \
-I. ${LDAPCFLAGS} -I. ${LDAPCFLAGS}
CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\"" CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""

3
kerberos5/lib/libheimntlm/Makefile
View File

@ -5,7 +5,8 @@ LDFLAGS= -Wl,--no-undefined
LIBADD= crypto com_err krb5 roken LIBADD= crypto com_err krb5 roken
SRCS= ntlm.c ntlm_err.c ntlm_err.h SRCS= ntlm.c ntlm_err.c ntlm_err.h
INCS= heimntlm.h heimntlm-protos.h ntlm_err.h INCS= heimntlm.h heimntlm-protos.h ntlm_err.h
CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken CFLAGS+=-I${KRB5DIR}/lib/ntlm -I${KRB5DIR}/lib/roken \
-I${SRCTOP}/contrib/com_err
VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map VERSION_MAP= ${KRB5DIR}/lib/ntlm/version-script.map
MAN= ntlm_buf.3 \ MAN= ntlm_buf.3 \

4
kerberos5/lib/libhx509/Makefile
View File

@ -211,7 +211,9 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509
CFLAGS+=-I${KRB5DIR}/lib/hx509/ref CFLAGS+=-I${KRB5DIR}/lib/hx509/ref
CFLAGS+=-I${KRB5DIR}/lib/asn1 CFLAGS+=-I${KRB5DIR}/lib/asn1
CFLAGS+=-I${KRB5DIR}/lib/wind CFLAGS+=-I${KRB5DIR}/lib/wind
CFLAGS+=-I${KRB5DIR}/lib/roken -I. CFLAGS+=-I${KRB5DIR}/lib/roken
CFLAGS+=-I${SRCTOP}/contrib/com_err
CFLAGS+=-I.
GEN_OCSP= \ GEN_OCSP= \
asn1_OCSPBasicOCSPResponse.x \ asn1_OCSPBasicOCSPResponse.x \

3
kerberos5/lib/libkadm5clnt/Makefile
View File

@ -34,7 +34,8 @@ SRCS= ad.c \
rename_c.c \ rename_c.c \
send_recv.c send_recv.c
CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I${SRCTOP}/contrib/com_err -I.
.include <bsd.lib.mk> .include <bsd.lib.mk>

3
kerberos5/lib/libkadm5srv/Makefile
View File

@ -35,7 +35,8 @@ SRCS= acl.c \
set_keys.c \ set_keys.c \
set_modifier.c set_modifier.c
CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I${SRCTOP}/contrib/com_err -I.
.include <bsd.lib.mk> .include <bsd.lib.mk>

3
kerberos5/lib/libkdc/Makefile
View File

@ -28,7 +28,8 @@ SRCS= \
CFLAGS+= -I${KRB5DIR}/lib/roken \ CFLAGS+= -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/hdb \ -I${KRB5DIR}/lib/hdb \
-I${KRB5DIR}/kdc -I${KRB5DIR}/kdc \
-I${SRCTOP}/contrib/com_err
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
kerberos5/lib/libkrb5/Makefile
View File

@ -621,7 +621,9 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/lib/ipc \
-I${KRB5DIR}/base -I. -I${KRB5DIR}/base \
-I${SRCTOP}/contrib/com_err \
-I.
.include <bsd.lib.mk> .include <bsd.lib.mk>

2
kerberos5/lib/libwind/Makefile
View File

@ -27,7 +27,7 @@ SRCS= bidi.c \
SRCS+= wind_err.c \ SRCS+= wind_err.c \
wind_err.h wind_err.h
CFLAGS+=-I${KRB5DIR}/lib/roken -I. CFLAGS+=-I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/com_err -I.
.include <bsd.lib.mk> .include <bsd.lib.mk>

3
kerberos5/libexec/digest-service/Makefile
View File

@ -7,7 +7,8 @@ CFLAGS+= -I${KRB5DIR}/kdc \
-I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/ipc \ -I${KRB5DIR}/lib/ipc \
-I${KRB5DIR}/lib/wind \ -I${KRB5DIR}/lib/wind \
-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/roken \
-I${SRCTOP}/contrib/com_err
LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm LIBADD= hdb kdc heimipcs krb5 roken asn1 crypto vers heimntlm
LDFLAGS=${LDAPLDFLAGS} LDFLAGS=${LDAPLDFLAGS}

1
kerberos5/libexec/hprop/Makefile
View File

@ -9,6 +9,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1
CFLAGS+=-I${KRB5DIR}/lib/hx509 CFLAGS+=-I${KRB5DIR}/lib/hx509
CFLAGS+=-I${KRB5DIR}/lib/ntlm CFLAGS+=-I${KRB5DIR}/lib/ntlm
CFLAGS+=-I${KRB5DIR}/kdc CFLAGS+=-I${KRB5DIR}/kdc
CFLAGS+=-I${SRCTOP}/contrib/com_err
CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5 CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5
LIBADD= hdb krb5 roken vers LIBADD= hdb krb5 roken vers
DPADD= ${LDAPDPADD} DPADD= ${LDAPDPADD}

2
kerberos5/libexec/hpropd/Makefile
View File

@ -3,7 +3,7 @@
PROG= hpropd PROG= hpropd
MAN= hpropd.8 MAN= hpropd.8
CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \ CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/kdc ${LDAPCFLAGS} -I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS}
LIBADD= hdb krb5 roken vers LIBADD= hdb krb5 roken vers
DPADD= ${LDAPDPADD} DPADD= ${LDAPDPADD}
LDADD= ${LDAPLDADD} LDADD= ${LDAPLDADD}

2
kerberos5/libexec/kadmind/Makefile
View File

@ -8,7 +8,7 @@ SRCS= rpc.c \
kadm_conn.c kadm_conn.c
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
${LDAPCFLAGS} -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS}
LIBADD= kadm5srv gssapi hdb krb5 roken vers LIBADD= kadm5srv gssapi hdb krb5 roken vers
DPADD= ${LDAPDPADD} DPADD= ${LDAPDPADD}
LDADD= ${LDAPLDADD} LDADD= ${LDAPLDADD}

2
kerberos5/libexec/kdc/Makefile
View File

@ -9,7 +9,7 @@ SRCS= config.c \
main.c main.c
CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kdc ${LDAPCFLAGS} -I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS}
LIBADD= kdc hdb krb5 roken crypt vers LIBADD= kdc hdb krb5 roken crypt vers
LDFLAGS=${LDAPLDFLAGS} LDFLAGS=${LDAPLDFLAGS}

4
kerberos5/usr.bin/hxtool/Makefile
View File

@ -5,7 +5,9 @@ MAN=
CFLAGS+= -I${KRB5DIR}/lib/hx509 \ CFLAGS+= -I${KRB5DIR}/lib/hx509 \
-I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/sl -I. -I${KRB5DIR}/lib/sl \
-I${SRCTOP}/contrib/com_err \
-I.
LIBADD= hx509 roken asn1 crypto sl vers edit LIBADD= hx509 roken asn1 crypto sl vers edit
SRCS= hxtool.c hxtool-commands.c hxtool-commands.h SRCS= hxtool.c hxtool-commands.c hxtool-commands.h

2
kerberos5/usr.bin/kadmin/Makefile
View File

@ -25,7 +25,7 @@ SRCS= add_enctype.c \
util.c util.c
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/sl -I. ${LDAPCFLAGS} -I${KRB5DIR}/lib/sl -I${SRCTOP}/contrib/com_err -I. ${LDAPCFLAGS}
LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit LIBADD= kadm5clnt kadm5srv hdb krb5 roken vers sl asn1 crypto edit
DPADD= ${LDAPDPADD} DPADD= ${LDAPDPADD}
LDADD= ${LDAPLDADD} LDADD= ${LDAPLDADD}

3
kerberos5/usr.bin/string2key/Makefile
View File

@ -6,7 +6,8 @@ CFLAGS+= -I${KRB5DIR}/kdc \
-I${KRB5DIR}/lib/asn1 \ -I${KRB5DIR}/lib/asn1 \
-I${KRB5DIR}/lib/krb5 \ -I${KRB5DIR}/lib/krb5 \
-I${KRB5DIR}/lib/roken \ -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/windc -I${KRB5DIR}/lib/windc \
-I${SRCTOP}/contrib/com_err
LIBADD= krb5 roken crypto vers LIBADD= krb5 roken crypto vers
.include <bsd.prog.mk> .include <bsd.prog.mk>

3
kerberos5/usr.bin/verify_krb5_conf/Makefile
View File

@ -2,7 +2,8 @@
PROG= verify_krb5_conf PROG= verify_krb5_conf
MAN= verify_krb5_conf.8 MAN= verify_krb5_conf.8
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
-I${SRCTOP}/contrib/com_err
LIBADD= krb5 roken vers LIBADD= krb5 roken vers
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
kerberos5/usr.sbin/kstash/Makefile
View File

@ -3,7 +3,7 @@
PROG= kstash PROG= kstash
MAN= kstash.8 MAN= kstash.8
CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/kdc ${LDAPCFLAGS} -I${KRB5DIR}/kdc -I${SRCTOP}/contrib/com_err ${LDAPCFLAGS}
LIBADD= hdb krb5 crypto vers LIBADD= hdb krb5 crypto vers
DPADD= ${LDAPDPADD} DPADD= ${LDAPDPADD}
LDADD= ${LDAPLDADD} LDADD= ${LDAPLDADD}