From owner-svn-src-head@FreeBSD.ORG Fri Mar 23 03:16:36 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2914A1065670; Fri, 23 Mar 2012 03:16:36 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0AE8B8FC15; Fri, 23 Mar 2012 03:16:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2N3GZeI054608; Fri, 23 Mar 2012 03:16:35 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2N3GZW8054603; Fri, 23 Mar 2012 03:16:35 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201203230316.q2N3GZW8054603@svn.freebsd.org> From: Stanislav Sedov Date: Fri, 23 Mar 2012 03:16:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r233337 - in head: . lib tools/build/mk usr.bin X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Mar 2012 03:16:36 -0000 Author: stas Date: Fri Mar 23 03:16:35 2012 New Revision: 233337 URL: http://svn.freebsd.org/changeset/base/233337 Log: - Do not build libcom_err and compile_et when kerberos is disabled. They depends on several heimdal libraries and not used by anything but kerberos tools. Modified: head/Makefile.inc1 head/lib/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.bin/Makefile Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Fri Mar 23 00:11:54 2012 (r233336) +++ head/Makefile.inc1 Fri Mar 23 03:16:35 2012 (r233337) @@ -1254,7 +1254,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1 ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ - lib/libbz2 lib/libcom_err lib/libcrypt \ + lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd \ @@ -1341,6 +1341,7 @@ _kerberos5_lib_libheimntlm= kerberos5/li _kerberos5_lib_libheimsqlite= kerberos5/lib/libheimsqlite _kerberos5_lib_libheimipcc= kerberos5/lib/libheimipcc _kerberos5_lib_libwind= kerberos5/lib/libwind +_libcom_err= lib/libcom_err .endif .if ${MK_NIS} != "no" Modified: head/lib/Makefile ============================================================================== --- head/lib/Makefile Fri Mar 23 00:11:54 2012 (r233336) +++ head/lib/Makefile Fri Mar 23 03:16:35 2012 (r233337) @@ -33,7 +33,6 @@ SUBDIR_ORDERED= ${_csu} \ libc \ libbsm \ libauditd \ - libcom_err \ libcompiler_rt \ libcrypt \ libelf \ @@ -52,6 +51,10 @@ SUBDIR_ORDERED= ${_csu} \ ${_libcxxrt} \ ${_libcplusplus} +.if ${MK_KERBEROS_SUPPORT} != "no" +SUBDIR_ORDERED+= libcom_err +.endif + SUBDIR= ${SUBDIR_ORDERED} \ libalias \ libarchive \ Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 23 00:11:54 2012 (r233336) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Mar 23 03:16:35 2012 (r233337) @@ -2184,6 +2184,7 @@ OLD_FILES+=usr/share/man/man8/jls.8.gz .endif .if ${MK_KERBEROS} == no +OLD_FILES+=usr/bin/compile_et OLD_FILES+=usr/bin/hxtool OLD_FILES+=usr/bin/kadmin OLD_FILES+=usr/bin/kdestroy @@ -2266,6 +2267,11 @@ OLD_FILES+=usr/lib/libasn1.a OLD_FILES+=usr/lib/libasn1.so OLD_LIBS+=usr/lib/libasn1.so.10 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.so OLD_LIBS+=usr/lib/libgssapi_krb5.so.10 Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Fri Mar 23 00:11:54 2012 (r233336) +++ head/usr.bin/Makefile Fri Mar 23 03:16:35 2012 (r233337) @@ -261,6 +261,10 @@ SUBDIR+= csup SUBDIR+= locate .endif +.if ${MK_KERBEROS_SUPPORT} != "no" +SUBDIR+= compile_et +.endif + # XXX msgs? .if ${MK_MAIL} != "no" SUBDIR+= biff @@ -317,7 +321,6 @@ SUBDIR+= ul SUBDIR+= ar SUBDIR+= c89 SUBDIR+= c99 -SUBDIR+= compile_et SUBDIR+= ctags SUBDIR+= file2c SUBDIR+= gprof