diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-23 19:29:18 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-23 19:29:18 +0200 |
commit | e0ab58405982a858f0e9d4c16c456131c7ba791d (patch) | |
tree | 95d5a7d4cd1bea67944457f8dc1d2ebbdb2443ec /package/openssh/Makefile | |
parent | dd5962419c3fe6f297b612ea0719c2057174130a (diff) | |
parent | ffffb0121dbf54f491560c3539e6269e432517ae (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openssh/Makefile')
-rw-r--r-- | package/openssh/Makefile | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 1eef11a96..0951ee9d1 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 6.6p1 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 3e9800e6bca1fbac0eea4d41baa7f239 +PKG_VERSION:= 6.7p1 +PKG_RELEASE:= 2 +PKG_MD5SUM:= 3246aa79317b1d23cae783a3bf8275d6 PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security PKG_BUILDDEP:= zlib openssl @@ -45,6 +45,8 @@ $(eval $(call PKG_template,OPENSSH_CLIENT_UTILS,openssh-client-utils,${PKG_VERSI $(eval $(call PKG_template,OPENSSH_SFTP_CLIENT,openssh-sftp-client,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SFTP_CLIENT},${PKGSD_OPENSSH_SFTP_CLIENT},${PKG_SECTION})) $(eval $(call PKG_template,OPENSSH_SFTP_SERVER,openssh-sftp-server,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_OPENSSH_SFTP_SERVER},${PKGSD_OPENSSH_SFTP_SERVER},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf + ifeq ($(ADK_PACKAGE_OPENSSH_WITH_KRB5),y) CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" endif @@ -55,6 +57,12 @@ else CONFIGURE_ARGS+= --without-stackprotect endif +ifeq ($(ADK_TARGET_USE_PIE),y) +CONFIGURE_ARGS+= --with-pie +else +CONFIGURE_ARGS+= --without-pie +endif + CONFIGURE_ENV+= LD='${TARGET_CC}' \ ac_cv_func_setlogin=no \ ac_cv_have_decl_PR_SET_NO_NEW_PRIVS=no \ |