> Author: nyan
> Date: Mon Jan 14 06:34:54 2019
> New Revision: 343011
> URL: https://svnweb.freebsd.org/changeset/base/343011
>
> Log:
> Use ${SRCTOP}/contrib/com_err/com_err.h instead of the installed com_err.h.
> This fixes build when com_err.h is not installed.
Isn't this the general state of affairs for almost all
of the source tree? I would rather see this solved
in a general way, rather than sprinkly all this
-I${SRCTOP} all over in the tree.
It use to be (and maybe still is) required that you run
cd $DRCTOP && make includes
if you expected new source code to compile. I expect
this has changed, but the just of it should work in
some aspect.
Thanks,
Rod
>
> PR: 234691
> MFC after: 1 week
>
> Modified:
> head/kerberos5/lib/libasn1/Makefile
> head/kerberos5/lib/libgssapi_krb5/Makefile
> head/kerberos5/lib/libhdb/Makefile
> head/kerberos5/lib/libheimntlm/Makefile
> head/kerberos5/lib/libhx509/Makefile
> head/kerberos5/lib/libkadm5clnt/Makefile
> head/kerberos5/lib/libkadm5srv/Makefile
> head/kerberos5/lib/libkdc/Makefile
> head/kerberos5/lib/libkrb5/Makefile
> head/kerberos5/lib/libwind/Makefile
> head/kerberos5/libexec/digest-service/Makefile
> head/kerberos5/libexec/hprop/Makefile
> head/kerberos5/libexec/hpropd/Makefile
> head/kerberos5/libexec/kadmind/Makefile
> head/kerberos5/libexec/kdc/Makefile
> head/kerberos5/usr.bin/hxtool/Makefile
> head/kerberos5/usr.bin/kadmin/Makefile
> head/kerberos5/usr.bin/string2key/Makefile
> head/kerberos5/usr.bin/verify_krb5_conf/Makefile
> head/kerberos5/usr.sbin/kstash/Makefile
>
> Modified: head/kerberos5/lib/libasn1/Makefile
> ==============================================================================
> --- head/kerberos5/lib/libasn1/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/lib/libasn1/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -21,7 +21,8 @@ SRCS= asn1_err.c \
> timegm.c \
> ${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_CMS= asn1_cms_asn1.x cms_asn1.hx cms_asn1-priv.hx
>
> Modified: head/kerberos5/lib/libgssapi_krb5/Makefile
> ==============================================================================
> --- head/kerberos5/lib/libgssapi_krb5/Makefile Mon Jan 14 03:19:08
> 2019 (r343010)
> +++ head/kerberos5/lib/libgssapi_krb5/Makefile Mon Jan 14 06:34:54
> 2019 (r343011)
> @@ -78,7 +78,9 @@ CFLAGS+=-I${KRB5DIR}/lib/gssapi/krb5
> CFLAGS+=-I${KRB5DIR}/lib/gssapi/gssapi
> CFLAGS+=-I${KRB5DIR}/lib/krb5
> 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>
>
>
> Modified: head/kerberos5/lib/libhdb/Makefile
> ==============================================================================
> --- head/kerberos5/lib/libhdb/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/lib/libhdb/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -59,6 +59,7 @@ SRCS= common.c \
> CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \
> -I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/sqlite3/ \
> -I${KRB5DIR}/lib/krb5 \
> + -I${SRCTOP}/contrib/com_err \
> -I. ${LDAPCFLAGS}
> CFLAGS+=-DHDB_DB_DIR="\"/var/heimdal\""
>
>
> Modified: head/kerberos5/lib/libheimntlm/Makefile
> ==============================================================================
> --- head/kerberos5/lib/libheimntlm/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/lib/libheimntlm/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -5,7 +5,8 @@ LDFLAGS= -Wl,--no-undefined
> LIBADD= crypto com_err krb5 roken
> SRCS= ntlm.c ntlm_err.c 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
>
> MAN= ntlm_buf.3 \
>
> Modified: head/kerberos5/lib/libhx509/Makefile
> ==============================================================================
> --- head/kerberos5/lib/libhx509/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/lib/libhx509/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -211,7 +211,9 @@ CFLAGS+=-I${KRB5DIR}/lib/hx509
> CFLAGS+=-I${KRB5DIR}/lib/hx509/ref
> CFLAGS+=-I${KRB5DIR}/lib/asn1
> 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= \
> asn1_OCSPBasicOCSPResponse.x \
>
> Modified: head/kerberos5/lib/libkadm5clnt/Makefile
> ==============================================================================
> --- head/kerberos5/lib/libkadm5clnt/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/lib/libkadm5clnt/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -34,7 +34,8 @@ SRCS= ad.c \
> rename_c.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>
>
>
> Modified: head/kerberos5/lib/libkadm5srv/Makefile
> ==============================================================================
> --- head/kerberos5/lib/libkadm5srv/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/lib/libkadm5srv/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -35,7 +35,8 @@ SRCS= acl.c \
> set_keys.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>
>
>
> Modified: head/kerberos5/lib/libkdc/Makefile
> ==============================================================================
> --- head/kerberos5/lib/libkdc/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/lib/libkdc/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -28,7 +28,8 @@ SRCS= \
> CFLAGS+= -I${KRB5DIR}/lib/roken \
> -I${KRB5DIR}/lib/krb5 \
> -I${KRB5DIR}/lib/hdb \
> - -I${KRB5DIR}/kdc
> + -I${KRB5DIR}/kdc \
> + -I${SRCTOP}/contrib/com_err
>
> .include <bsd.lib.mk>
>
>
> Modified: head/kerberos5/lib/libkrb5/Makefile
> ==============================================================================
> --- head/kerberos5/lib/libkrb5/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/lib/libkrb5/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -621,7 +621,9 @@ CFLAGS+= -I${KRB5DIR}/lib/krb5 \
> -I${KRB5DIR}/lib/asn1 \
> -I${KRB5DIR}/lib/roken \
> -I${KRB5DIR}/lib/ipc \
> - -I${KRB5DIR}/base -I.
> + -I${KRB5DIR}/base \
> + -I${SRCTOP}/contrib/com_err \
> + -I.
>
> .include <bsd.lib.mk>
>
>
> Modified: head/kerberos5/lib/libwind/Makefile
> ==============================================================================
> --- head/kerberos5/lib/libwind/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/lib/libwind/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -27,7 +27,7 @@ SRCS= bidi.c \
> SRCS+= wind_err.c \
> wind_err.h
>
> -CFLAGS+=-I${KRB5DIR}/lib/roken -I.
> +CFLAGS+=-I${KRB5DIR}/lib/roken -I${SRCTOP}/contrib/com_err -I.
>
> .include <bsd.lib.mk>
>
>
> Modified: head/kerberos5/libexec/digest-service/Makefile
> ==============================================================================
> --- head/kerberos5/libexec/digest-service/Makefile Mon Jan 14 03:19:08
> 2019 (r343010)
> +++ head/kerberos5/libexec/digest-service/Makefile Mon Jan 14 06:34:54
> 2019 (r343011)
> @@ -7,7 +7,8 @@ CFLAGS+= -I${KRB5DIR}/kdc \
> -I${KRB5DIR}/lib/krb5 \
> -I${KRB5DIR}/lib/ipc \
> -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
> LDFLAGS=${LDAPLDFLAGS}
>
>
> Modified: head/kerberos5/libexec/hprop/Makefile
> ==============================================================================
> --- head/kerberos5/libexec/hprop/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/libexec/hprop/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -9,6 +9,7 @@ CFLAGS+=-I${KRB5DIR}/lib/asn1
> CFLAGS+=-I${KRB5DIR}/lib/hx509
> CFLAGS+=-I${KRB5DIR}/lib/ntlm
> CFLAGS+=-I${KRB5DIR}/kdc
> +CFLAGS+=-I${SRCTOP}/contrib/com_err
> CFLAGS+=-I${.OBJDIR:H:H}/lib/libkrb5
> LIBADD= hdb krb5 roken vers
> DPADD= ${LDAPDPADD}
>
> Modified: head/kerberos5/libexec/hpropd/Makefile
> ==============================================================================
> --- head/kerberos5/libexec/hpropd/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/libexec/hpropd/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -3,7 +3,7 @@
> PROG= hpropd
> MAN= hpropd.8
> 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
> DPADD= ${LDAPDPADD}
> LDADD= ${LDAPLDADD}
>
> Modified: head/kerberos5/libexec/kadmind/Makefile
> ==============================================================================
> --- head/kerberos5/libexec/kadmind/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/libexec/kadmind/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -8,7 +8,7 @@ SRCS= rpc.c \
> kadm_conn.c
>
> 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
> DPADD= ${LDAPDPADD}
> LDADD= ${LDAPLDADD}
>
> Modified: head/kerberos5/libexec/kdc/Makefile
> ==============================================================================
> --- head/kerberos5/libexec/kdc/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/libexec/kdc/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -9,7 +9,7 @@ SRCS= config.c \
> main.c
>
> 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
> LDFLAGS=${LDAPLDFLAGS}
>
>
> Modified: head/kerberos5/usr.bin/hxtool/Makefile
> ==============================================================================
> --- head/kerberos5/usr.bin/hxtool/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/usr.bin/hxtool/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -5,7 +5,9 @@ MAN=
> CFLAGS+= -I${KRB5DIR}/lib/hx509 \
> -I${KRB5DIR}/lib/asn1 \
> -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
> SRCS= hxtool.c hxtool-commands.c hxtool-commands.h
>
>
> Modified: head/kerberos5/usr.bin/kadmin/Makefile
> ==============================================================================
> --- head/kerberos5/usr.bin/kadmin/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/usr.bin/kadmin/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -25,7 +25,7 @@ SRCS= add_enctype.c \
> util.c
>
> 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
> DPADD= ${LDAPDPADD}
> LDADD= ${LDAPLDADD}
>
> Modified: head/kerberos5/usr.bin/string2key/Makefile
> ==============================================================================
> --- head/kerberos5/usr.bin/string2key/Makefile Mon Jan 14 03:19:08
> 2019 (r343010)
> +++ head/kerberos5/usr.bin/string2key/Makefile Mon Jan 14 06:34:54
> 2019 (r343011)
> @@ -6,7 +6,8 @@ CFLAGS+= -I${KRB5DIR}/kdc \
> -I${KRB5DIR}/lib/asn1 \
> -I${KRB5DIR}/lib/krb5 \
> -I${KRB5DIR}/lib/roken \
> - -I${KRB5DIR}/lib/windc
> + -I${KRB5DIR}/lib/windc \
> + -I${SRCTOP}/contrib/com_err
> LIBADD= krb5 roken crypto vers
>
> .include <bsd.prog.mk>
>
> Modified: head/kerberos5/usr.bin/verify_krb5_conf/Makefile
> ==============================================================================
> --- head/kerberos5/usr.bin/verify_krb5_conf/Makefile Mon Jan 14 03:19:08
> 2019 (r343010)
> +++ head/kerberos5/usr.bin/verify_krb5_conf/Makefile Mon Jan 14 06:34:54
> 2019 (r343011)
> @@ -2,7 +2,8 @@
>
> PROG= verify_krb5_conf
> 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
>
> .include <bsd.prog.mk>
>
> Modified: head/kerberos5/usr.sbin/kstash/Makefile
> ==============================================================================
> --- head/kerberos5/usr.sbin/kstash/Makefile Mon Jan 14 03:19:08 2019
> (r343010)
> +++ head/kerberos5/usr.sbin/kstash/Makefile Mon Jan 14 06:34:54 2019
> (r343011)
> @@ -3,7 +3,7 @@
> PROG= kstash
> MAN= kstash.8
> 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
> DPADD= ${LDAPDPADD}
> LDADD= ${LDAPLDADD}
>
>
--
Rod Grimes rgri...@freebsd.org
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
