Date: Thu, 6 Aug 2009 11:25:55 GMT From: bf <bf1783@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: conf/137483: [PATCH] unbreak world for WITHOUT_SSH, WITHOUT_KERBEROS+WITH_GSSAPI; unbreak various targets WITHOUT_MAIL Message-ID: <200908061125.n76BPtYZ092433@www.freebsd.org> Resent-Message-ID: <200908061130.n76BU21p004213@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137483 >Category: conf >Synopsis: [PATCH] unbreak world for WITHOUT_SSH, WITHOUT_KERBEROS+WITH_GSSAPI; unbreak various targets WITHOUT_MAIL >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Aug 06 11:30:02 UTC 2009 >Closed-Date: >Last-Modified: >Originator: bf >Release: 8-BETA2 amd64 >Organization: - >Environment: >Description: WITHOUT_SSH=yes breaks the buildworld target due to improperly nested Makefile rules. The same is true for WITHOUT_KERBEROS=yes + WITH_GSSAPI=yes. WITHOUT_MAIL=yes removes /usr/bin/fmt, and thus breaks the doxygen and delete-old-libs targets. >How-To-Repeat: >Fix: Patch attached with submission follows: --- src/Makefile.inc1.orig 2009-08-05 20:40:54.000000000 -0400 +++ src/Makefile.inc1 2009-08-06 07:06:50.000000000 -0400 @@ -823,7 +823,12 @@ # doxygen: @if [ ! -x `/usr/bin/which doxygen` ]; then \ - echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ + doxymsg="You need doxygen (devel/doxygen) to generate the API documentation of the kernel." ; \ + if [ -x /usr/bin/fmt ]; then \ + echo ${doxymsg} | /usr/bin/fmt; \ + else \ + echo ${doxymsg} ; \ + fi; \ exit 1; \ fi cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all @@ -1118,14 +1123,16 @@ _secure_lib_libcrypto= secure/lib/libcrypto _secure_lib_libssl= secure/lib/libssl lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L -.if ${MK_OPENSSH} != "no" -_secure_lib_libssh= secure/lib/libssh -secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ lib/libcrypt__L +.endif +.if ${MK_OPENSSH} != "no" +_secure_lib_libssh= secure/lib/libssh +secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L +.if ${MK_KERBEROS_SUPPORT} != "no" secure/lib/libssh__L: lib/libgssapi__L kerberos5/lib/libgssapi_krb5__L .endif .endif @@ -1145,6 +1152,9 @@ _kerberos5_lib_libroken= kerberos5/lib/libroken _kerberos5_lib_libheimntlm= kerberos5/lib/libheimntlm _kerberos5_lib_libgssapi_krb5= kerberos5/lib/libgssapi_krb5 +.endif + +.if ${MK_GSSAPI} != "no" _lib_libgssapi= lib/libgssapi .endif @@ -1278,7 +1288,11 @@ delete-old-libs: @echo ">>> Removing old libraries" - @echo "${OLD_LIBS_MESSAGE}" | fmt + @if [ -x /usr/bin/fmt ]; then \ + echo "${OLD_LIBS_MESSAGE}" | /usr/bin/fmt; \ + else \ + echo "${OLD_LIBS_MESSAGE}" ; \ + fi @for file in ${OLD_LIBS}; do \ if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \ chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908061125.n76BPtYZ092433>