commit 971e4c6c1155eaf6c18ae81874dbc1a0367a227c parent 751629b2195a421941ef69e81a29d420a282c729 Author: Hiltjo Posthuma <hiltjo@codemadness.org> Date: Mon, 19 May 2014 17:03:04 +0200 openssh: improve build - set ac_cv_path_AR if "ar" is not in your path. - don't reapply patch if its already applied. Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org> Diffstat:
| M | openssh/openssh.mk | | | 21 | ++++++++++++--------- |
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/openssh/openssh.mk b/openssh/openssh.mk @@ -7,21 +7,24 @@ openssh:QV: export CFLAGS="$CFLAGS $DEPS_CFLAGS" export LDFLAGS="$LDFLAGS $DEPS_LDFLAGS" # fix implicit declarations - patch -p1 < ../openssh-configure.patch - patch -p1 < ../openssh-sys_param.patch + patch --silent --dry-run -N -p1 < ../openssh-configure.patch && \ + patch -p1 < ../openssh-configure.patch + patch --silent --dry-run -N -p1 < ../openssh-sys_param.patch && \ + patch -p1 < ../openssh-sys_param.patch # prevent from installing some things (keysign and maybe others) setuid. sed -i 's@-m 4711@-m 0750@g' Makefile.in # work around for issue #104 until we come up with a proper patch issue104cflags="-fno-builtin-exit -D__noreturn__=" CC="${CC} -static" \ + ac_cv_path_AR="${AR}" \ CFLAGS="$issue104cflags -D_BSD_SOURCE -DMISSING_FD_MASK -DMISSING_NFDBITS $CFLAGS" \ - ./configure -C --prefix="$prefix" \ - --sbindir="$prefix"/bin --libexecdir="$prefix"/lib/ssh \ - --sysconfdir="$prefix"/etc/ssh \ - --with-privsep-user=nobody \ - --with-md5-passwords --with-mantype=man --mandir="$prefix"/share/man \ - --disable-strip --disable-lastlog --disable-utmp --disable-utmpx --disable-btmp \ - --disable-wtmp --disable-wtmpx --disable-pututline --disable-pututxline + ./configure -C --prefix="$prefix" \ + --sbindir="$prefix"/bin --libexecdir="$prefix"/lib/ssh \ + --sysconfdir="$prefix"/etc/ssh \ + --with-privsep-user=nobody \ + --with-md5-passwords --with-mantype=man --mandir="$prefix"/share/man \ + --disable-strip --disable-lastlog --disable-utmp --disable-utmpx --disable-btmp \ + --disable-wtmp --disable-wtmpx --disable-pututline --disable-pututxline mkdir netinet touch netinet/in_systm.h sed -i '/USE_BTMP/d' config.h