Use find-headers instead of find-files to detect builtin header files.

This commit is contained in:
obache 2013-11-23 12:10:13 +00:00
parent 0d10f8bc91
commit b46a4d823f
10 changed files with 38 additions and 39 deletions

View file

@ -1,10 +1,10 @@
# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:37 reed Exp $
# $NetBSD: builtin.mk,v 1.15 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= linux-pam
BUILTIN_FIND_FILES_VAR:= H_LINUX_PAM
BUILTIN_FIND_FILES.H_LINUX_PAM= /usr/include/security/pam_appl.h \
/usr/include/pam/pam_appl.h
BUILTIN_FIND_HEADERS_VAR:= H_LINUX_PAM
BUILTIN_FIND_HEADERS.H_LINUX_PAM= security/pam_appl.h \
pam/pam_appl.h
BUILTIN_FIND_GREP.H_LINUX_PAM= The Linux-PAM Framework layer API
.include "../../mk/buildlink3/bsd.builtin.mk"

View file

@ -1,10 +1,11 @@
# $NetBSD: builtin.mk,v 1.13 2011/01/23 10:01:37 markd Exp $
# $NetBSD: builtin.mk,v 1.14 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= heimdal
BUILTIN_FIND_FILES_VAR:= H_HEIMDAL SH_KRB5_CONFIG
BUILTIN_FIND_FILES.H_HEIMDAL= /usr/include/krb5/krb5.h /usr/include/krb5.h
BUILTIN_FIND_HEADERS_VAR:= H_HEIMDAL
BUILTIN_FIND_HEADERS.H_HEIMDAL= krb5/krb5.h krb5.h
BUILTIN_FIND_GREP.H_HEIMDAL= heimdal_version
BUILTIN_FIND_FILES_VAR:= SH_KRB5_CONFIG
BUILTIN_FIND_FILES.SH_KRB5_CONFIG= /usr/bin/krb5-config
BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*--version)

View file

@ -1,9 +1,9 @@
# $NetBSD: builtin.mk,v 1.6 2006/04/06 06:22:42 reed Exp $
# $NetBSD: builtin.mk,v 1.7 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= libdes
BUILTIN_FIND_FILES_VAR:= H_LIBDES
BUILTIN_FIND_FILES.H_LIBDES= /usr/include/libdes.h /usr/include/des.h
BUILTIN_FIND_HEADERS_VAR:= H_LIBDES
BUILTIN_FIND_HEADERS.H_LIBDES= libdes.h des.h
.include "../../mk/buildlink3/bsd.builtin.mk"

View file

@ -1,19 +1,20 @@
# $NetBSD: builtin.mk,v 1.8 2013/10/26 05:28:43 richard Exp $
# $NetBSD: builtin.mk,v 1.9 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= mit-krb5
.include "../../mk/bsd.fast.prefs.mk"
BUILTIN_FIND_FILES_VAR:= H_MIT_KRB5 SH_KRB5_CONFIG
BUILTIN_FIND_HEADERS_VAR:= H_MIT_KRB5
.if !(empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \
empty(MACHINE_PLATFORM:MDarwin-10.*-*))
BUILTIN_FIND_FILES.H_MIT_KRB5= /usr/include/krb5/krb5.h
BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5/krb5.h
.elif !empty(MACHINE_PLATFORM:MSunOS-*-*)
BUILTIN_FIND_FILES.H_MIT_KRB5= /usr/include/kerberosv5/krb5.h
BUILTIN_FIND_HEADERS.H_MIT_KRB5= kerberosv5/krb5.h
.else
BUILTIN_FIND_FILES.H_MIT_KRB5= /usr/include/krb5.h
BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5.h
.endif
BUILTIN_FIND_GREP.H_MIT_KRB5= Massachusetts Institute of Technology
BUILTIN_FIND_FILES_VAR:= SH_KRB5_CONFIG
BUILTIN_FIND_FILES.SH_KRB5_CONFIG= /usr/bin/krb5-config
BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*--version)

View file

@ -1,9 +1,9 @@
# $NetBSD: builtin.mk,v 1.8 2008/01/29 00:52:58 obache Exp $
# $NetBSD: builtin.mk,v 1.9 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= openpam
BUILTIN_FIND_FILES_VAR:= H_OPENPAM
BUILTIN_FIND_FILES.H_OPENPAM= /usr/include/security/openpam_version.h
BUILTIN_FIND_HEADERS_VAR:= H_OPENPAM
BUILTIN_FIND_HEADERS.H_OPENPAM= security/openpam_version.h
.include "../../mk/buildlink3/bsd.builtin.mk"

View file

@ -1,15 +1,11 @@
# $NetBSD: builtin.mk,v 1.35 2013/10/06 12:54:10 obache Exp $
# $NetBSD: builtin.mk,v 1.36 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= openssl
BUILTIN_FIND_LIBS:= crypto des ssl
BUILTIN_FIND_FILES_VAR:= H_OPENSSLCONF H_OPENSSLV
BUILTIN_FIND_FILES.H_OPENSSLCONF= /usr/include/openssl/opensslconf.h \
/usr/sfw/include/openssl/opensslconf.h \
/boot/common/include/openssl/opensslconf.h
BUILTIN_FIND_FILES.H_OPENSSLV= /usr/include/openssl/opensslv.h \
/usr/sfw/include/openssl/opensslv.h \
/boot/common/include/openssl/opensslv.h
BUILTIN_FIND_HEADERS_VAR:= H_OPENSSLCONF H_OPENSSLV
BUILTIN_FIND_HEADERS.H_OPENSSLCONF= openssl/opensslconf.h
BUILTIN_FIND_HEADERS.H_OPENSSLV= openssl/opensslv.h
.include "../../mk/buildlink3/bsd.builtin.mk"

View file

@ -1,9 +1,9 @@
# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:44 reed Exp $
# $NetBSD: builtin.mk,v 1.5 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= skey
BUILTIN_FIND_FILES_VAR:= H_SKEY
BUILTIN_FIND_FILES.H_SKEY= /usr/include/skey.h
BUILTIN_FIND_HEADERS_VAR:= H_SKEY
BUILTIN_FIND_HEADERS.H_SKEY= skey.h
.include "../../mk/buildlink3/bsd.builtin.mk"

View file

@ -1,10 +1,10 @@
# $NetBSD: builtin.mk,v 1.8 2006/04/06 06:22:44 reed Exp $
# $NetBSD: builtin.mk,v 1.9 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= tcp_wrappers
BUILTIN_FIND_LIBS:= wrap
BUILTIN_FIND_FILES_VAR:= H_TCP_WRAPPERS
BUILTIN_FIND_FILES.H_TCP_WRAPPERS= /usr/include/tcpd.h
BUILTIN_FIND_HEADERS_VAR:= H_TCP_WRAPPERS
BUILTIN_FIND_HEADERS.H_TCP_WRAPPERS= tcpd.h
.include "../../mk/buildlink3/bsd.builtin.mk"

View file

@ -1,9 +1,9 @@
# $NetBSD: builtin.mk,v 1.4 2006/04/06 06:22:45 reed Exp $
# $NetBSD: builtin.mk,v 1.5 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= fam
BUILTIN_FIND_FILES_VAR:= H_FAM
BUILTIN_FIND_FILES.H_FAM= /usr/include/fam.h
BUILTIN_FIND_HEADERS_VAR:= H_FAM
BUILTIN_FIND_HEADERS.H_FAM= fam.h
.include "../../mk/buildlink3/bsd.builtin.mk"

View file

@ -1,11 +1,12 @@
# $NetBSD: builtin.mk,v 1.6 2009/03/09 17:47:36 cube Exp $
# $NetBSD: builtin.mk,v 1.7 2013/11/23 12:10:13 obache Exp $
BUILTIN_PKG:= file
BUILTIN_FIND_FILES_VAR:= H_FILE BIN_FILE
BUILTIN_FIND_FILES.H_FILE= /usr/include/magic.h
BUILTIN_FIND_HEADERS_VAR:= H_FILE
BUILTIN_FIND_HEADERS.H_FILE= magic.h
BUILTIN_FIND_GREP.H_FILE= magic_file
BUILTIN_FIND_FILES.BIN_FILE= /bin/file /usr/bin/file
BUILTIN_FIND_FILES_VAR:= BIN_FILE
BUILTIN_FIND_FILES.BIN_FILE= ${TOOLS_PLATFORM.file} /bin/file /usr/bin/file
.include "../../mk/buildlink3/bsd.builtin.mk"