summaryrefslogtreecommitdiff
path: root/package/openssh/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-25 16:24:07 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-27 11:03:19 +0200
commit45bf2abc94df0dc4e5e1af41e90137a3cd653e7d (patch)
treeebc66e2381cf642ef6526ba9df9f5d820512fe44 /package/openssh/Makefile
parent77cf268edb1eaf11a4bdcd2b54d1fd19a44c42bd (diff)
get rid of heimdal, no updates in a year, no time to care for two krb5 implementations
Diffstat (limited to 'package/openssh/Makefile')
-rw-r--r--package/openssh/Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index dcd14056b..1eef11a96 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -30,14 +30,11 @@ PKGSN_OPENSSH_SFTP_CLIENT:= openssh
PKGSD_OPENSSH_SFTP_SERVER:= sftp server
PKGSN_OPENSSH_SFTP_SERVER:= openssh
-PKG_CHOICES_OPENSSH:= NOKRB WITH_KRB5 WITH_HEIMDAL
+PKG_CHOICES_OPENSSH:= NOKRB WITH_KRB5
PKGCD_NOKRB:= no Kerberos support
PKGCD_WITH_KRB5:= with MIT Kerberos
PKGCS_WITH_KRB5:= libkrb5 libcom-err
PKGCB_WITH_KRB5:= krb5
-PKGCD_WITH_HEIMDAL:= with Heimdal Kerberos
-PKGCS_WITH_HEIMDAL:= libheimdal libcom-err
-PKGCB_WITH_HEIMDAL:= heimdal
include ${ADK_TOPDIR}/mk/package.mk
@@ -51,10 +48,6 @@ $(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION
ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y)
CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr"
endif
-ifeq ($(ADK_PACKAGE_OPENSSH_WITH_HEIMDAL),y)
-CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr"
-TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal
-endif
ifeq ($(ADK_TARGET_USE_SSP),y)
CONFIGURE_ARGS+= --with-stackprotect