From e019d796188434af273c758b842f2681b1875636 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 4 Feb 2010 00:56:53 +0100
Subject: fix dependencies and indentation
---
package/openssh/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'package/openssh')
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 3b724edbc..29fd6a055 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -12,11 +12,11 @@ PKG_SECTION:= net
PKG_DEPENDS:= zlib libopenssl
PKG_BUILDDEP+= zlib openssl
ifeq (${ADK_COMPILE_OPENSSH_WITH_KRB5},y)
-PKG_DEPENDS+= krb5-libs libcom-err
+PKG_DEPENDS+= libkrb5 libcom-err
PKG_BUILDDEP+= krb5
endif
ifeq (${ADK_COMPILE_OPENSSH_WITH_HEIMDAL},y)
-PKG_DEPENDS+= heimdal-libs libcom-err
+PKG_DEPENDS+= libheimdal libcom-err
PKG_BUILDDEP+= heimdal
endif
PKG_URL:= http://www.openssh.com
--
cgit v1.2.3
From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles
All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.
I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.
I renamed CONFIGURE_STYLE to CONFIG_STYLE.
Updates for some packages, which have newer upstream versions.
Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
package/openssh/Makefile | 3 ---
1 file changed, 3 deletions(-)
(limited to 'package/openssh')
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 29fd6a055..016923b23 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -44,7 +44,6 @@ CONFIGURE_ARGS+= --with-kerberos5="${STAGING_DIR}/usr"
else
CONFIGURE_ARGS+= --without-kerberos5
endif
-CONFIGURE_STYLE:= gnu
CONFIGURE_ENV+= LD='${TARGET_CC}' \
ac_cv_func_setlogin=no \
ac_cv_lib_nsl_yp_match=no
@@ -63,8 +62,6 @@ CONFIGURE_ARGS+= --disable-strip \
--with-privsep-user=sshd \
--with-privsep-path=/var/run/sshd \
--with-ssl-dir="${STAGING_DIR}/usr"
-BUILD_STYLE:= auto
-INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh
--
cgit v1.2.3