diff options
| author | dougb <dougb@FreeBSD.org> | 2007-12-10 19:09:24 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2007-12-10 19:09:24 +0000 |
| commit | 13eeb9aa260c17324b860bc2f66af8f352657072 (patch) | |
| tree | e0d7a962bbcc2c3f8c45471b446b8d2908ec09d6 | |
| parent | 0d684d927bf42ec9c53b0f921e6aaa42e7236cd7 (diff) | |
| download | FreeBSD-src-13eeb9aa260c17324b860bc2f66af8f352657072.zip FreeBSD-src-13eeb9aa260c17324b860bc2f66af8f352657072.tar.gz | |
Hide the building and installation of libgssapi behind the
WITHOUT_KERBEROS knob. While GSS can be used for other things
some third party software (most notably ports/x11/kdelibs3)
takes the presence of libgssapi as an indication that kerberos
is available, and attempts to link with the kerberos libs. If
they are not available, the build will fail.
Because you might want to use GSS but not kerberos, add a knob
to re-enable it if WITHOUT_KERBEROS is present.
Document the new knob, and the new behavior of WITHOUT_KERBEROS.
Not objected and/or generally agreed to by: freebsd-arch
Problem discussed/analyzed in:
PR: ports/116484
| -rw-r--r-- | lib/Makefile | 10 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_KERBEROS | 5 | ||||
| -rw-r--r-- | tools/build/options/WITH_GSSAPI | 4 |
4 files changed, 19 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile index dbb26f7..3451703 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -31,7 +31,7 @@ SUBDIR= ${_csu} libc libbsm libcom_err libcrypt libelf libkvm msun libmd \ libbegemot ${_libbluetooth} libbsnmp libbz2 \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libftpio libgeom ${_libgpib} \ - libgssapi libipsec \ + ${_libgssapi} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpcap \ libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \ @@ -62,6 +62,14 @@ _libbluetooth= libbluetooth _libsdp= libsdp .endif +.if ${MK_KERBEROS} != "no" +_libgssapi= libgssapi +.else +.if ${MK_GSSAPI} == "yes" +_libgssapi= libgssapi +.endif +.endif + .if ${MK_IPX} != "no" _libipx= libipx .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 4e0491a..d1a89f2 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -381,6 +381,7 @@ MK_${var}:= yes # .for var in \ BIND_LIBS \ + GSSAPI \ HESIOD \ IDEA .if defined(WITH_${var}) && defined(WITHOUT_${var}) diff --git a/tools/build/options/WITHOUT_KERBEROS b/tools/build/options/WITHOUT_KERBEROS index 8f562ec..5d86ccf 100644 --- a/tools/build/options/WITHOUT_KERBEROS +++ b/tools/build/options/WITHOUT_KERBEROS @@ -1,2 +1,7 @@ .\" $FreeBSD$ Set this if you do not want to build Kerberos 5 (KTH Heimdal). +This option implies +.Va WITHOUT_GSSAPI . +Set +.Va WITH_GSSAPI +to override. diff --git a/tools/build/options/WITH_GSSAPI b/tools/build/options/WITH_GSSAPI new file mode 100644 index 0000000..77d9cde --- /dev/null +++ b/tools/build/options/WITH_GSSAPI @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to build libgssapi when +.Va WITHOUT_KERBEROS +is set. |
