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

- Do not build libcom_err and compile_et when kerberos is disabled. They

Browse Source 
depends on several heimdal libraries and not used by anything but kerberos
  tools.
This commit is contained in:
Stanislav Sedov 2012-03-23 03:16:35 +00:00
parent f86a93b5be
commit 0e46933c08
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.inc1
View File

@ -1254,7 +1254,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \
${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libroken} \
${_kerberos5_lib_libwind} \ ${_kerberos5_lib_libwind} \
lib/libbz2 lib/libcom_err lib/libcrypt \ lib/libbz2 ${_libcom_err} lib/libcrypt \
lib/libexpat \ lib/libexpat \
${_lib_libgssapi} ${_lib_libipx} \ ${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
@ -1341,6 +1341,7 @@ _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm
_kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite _kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite
_kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc
_kerberos5_lib_libwind= kerberos5/lib/libwind _kerberos5_lib_libwind= kerberos5/lib/libwind
_libcom_err= lib/libcom_err
.endif .endif
.if ${MK_NIS} != "no" .if ${MK_NIS} != "no"

5
lib/Makefile
View File

@ -33,7 +33,6 @@ SUBDIR_ORDERED= ${_csu} \
libc \ libc \
libbsm \ libbsm \
libauditd \ libauditd \
libcom_err \
libcompiler_rt \ libcompiler_rt \
libcrypt \ libcrypt \
libelf \ libelf \
@ -52,6 +51,10 @@ SUBDIR_ORDERED= ${_csu} \
${_libcxxrt} \ ${_libcxxrt} \
${_libcplusplus} ${_libcplusplus}
.if ${MK_KERBEROS_SUPPORT} != "no"
SUBDIR_ORDERED+= libcom_err
.endif
SUBDIR= ${SUBDIR_ORDERED} \ SUBDIR= ${SUBDIR_ORDERED} \
libalias \ libalias \
libarchive \ libarchive \

6
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -2184,6 +2184,7 @@ OLD_FILES+=usr/share/man/man8/jls.8.gz
.endif .endif
.if ${MK_KERBEROS} == no .if ${MK_KERBEROS} == no
OLD_FILES+=usr/bin/compile_et
OLD_FILES+=usr/bin/hxtool OLD_FILES+=usr/bin/hxtool
OLD_FILES+=usr/bin/kadmin OLD_FILES+=usr/bin/kadmin
OLD_FILES+=usr/bin/kdestroy OLD_FILES+=usr/bin/kdestroy
@ -2266,6 +2267,11 @@ OLD_FILES+=usr/lib/libasn1.a
OLD_FILES+=usr/lib/libasn1.so OLD_FILES+=usr/lib/libasn1.so
OLD_LIBS+=usr/lib/libasn1.so.10 OLD_LIBS+=usr/lib/libasn1.so.10
OLD_FILES+=usr/lib/libasn1_p.a OLD_FILES+=usr/lib/libasn1_p.a
OLD_FILES+=usr/lib/libcom_err.a
OLD_FILES+=usr/lib/libcom_err.so
OLD_LIBS+=usr/lib/libcom_err.so.5
OLD_FILES+=usr/lib/libcom_err_p.a
OLD_FILES+=usr/lib/libcom_err_p.a
OLD_FILES+=usr/lib/libgssapi_krb5.a OLD_FILES+=usr/lib/libgssapi_krb5.a
OLD_FILES+=usr/lib/libgssapi_krb5.so OLD_FILES+=usr/lib/libgssapi_krb5.so
OLD_LIBS+=usr/lib/libgssapi_krb5.so.10 OLD_LIBS+=usr/lib/libgssapi_krb5.so.10

5
usr.bin/Makefile
View File

@ -261,6 +261,10 @@ SUBDIR+= csup
SUBDIR+= locate SUBDIR+= locate
.endif .endif
.if ${MK_KERBEROS_SUPPORT} != "no"
SUBDIR+= compile_et
.endif
# XXX msgs? # XXX msgs?
.if ${MK_MAIL} != "no" .if ${MK_MAIL} != "no"
SUBDIR+= biff SUBDIR+= biff
@ -317,7 +321,6 @@ SUBDIR+= ul
SUBDIR+= ar SUBDIR+= ar
SUBDIR+= c89 SUBDIR+= c89
SUBDIR+= c99 SUBDIR+= c99
SUBDIR+= compile_et
SUBDIR+= ctags SUBDIR+= ctags
SUBDIR+= file2c SUBDIR+= file2c
SUBDIR+= gprof SUBDIR+= gprof