summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-09-24 00:45:36 +0000
committerMike Frysinger <vapier@gentoo.org>2004-09-24 00:45:36 +0000
commitd34f78b8a302e97683423b8755a381cf9c6e0edd (patch)
tree01ea55aa0c1d48ad9b18dba37f60709adc8bbdd1 /net-misc/dropbear
parentfiles/rp-pppoe.rc changed from need net to provide net as per bug #46906. (Ma... (diff)
downloadgentoo-2-d34f78b8a302e97683423b8755a381cf9c6e0edd.tar.gz
gentoo-2-d34f78b8a302e97683423b8755a381cf9c6e0edd.tar.bz2
gentoo-2-d34f78b8a302e97683423b8755a381cf9c6e0edd.zip
USE=static support #65108
Diffstat (limited to 'net-misc/dropbear')
-rw-r--r--net-misc/dropbear/ChangeLog6
-rw-r--r--net-misc/dropbear/dropbear-0.43.ebuild18
-rw-r--r--net-misc/dropbear/dropbear-0.44_alpha4.ebuild18
3 files changed, 25 insertions, 17 deletions
diff --git a/net-misc/dropbear/ChangeLog b/net-misc/dropbear/ChangeLog
index 028cb39be3d8..9894cb0ae014 100644
--- a/net-misc/dropbear/ChangeLog
+++ b/net-misc/dropbear/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/dropbear
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.12 2004/09/22 19:00:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/ChangeLog,v 1.13 2004/09/24 00:45:36 vapier Exp $
+
+ 23 Sep 2004; Mike Frysinger <vapier@gentoo.org> dropbear-0.43.ebuild,
+ dropbear-0.44_alpha4.ebuild:
+ Add support for USE=static #65108 by Frank Benkstein.
*dropbear-0.44_alpha4 (22 Sep 2004)
diff --git a/net-misc/dropbear/dropbear-0.43.ebuild b/net-misc/dropbear/dropbear-0.43.ebuild
index 4301b7a24359..bff1ffa1f042 100644
--- a/net-misc/dropbear/dropbear-0.43.ebuild
+++ b/net-misc/dropbear/dropbear-0.43.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.43.ebuild,v 1.1 2004/08/15 17:43:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.43.ebuild,v 1.2 2004/09/24 00:45:36 vapier Exp $
inherit gnuconfig
@@ -24,19 +24,19 @@ src_unpack() {
src_compile() {
econf `use_enable zlib` || die
+ local maketarget=""
if use multicall ; then
sed -i \
-e '/define DROPBEAR_MULTI/s:/\* *::' \
-e '/define DROPBEAR_MULTI/s:\*/::' \
options.h
- if use static ; then
- emake dropbearmultistatic || die "multi static failed"
- else
- emake dropbearmulti || die "multi failed"
- fi
+ use static \
+ && maketarget="dropbearmultistatic" \
+ || maketarget="dropbearmulti"
else
- emake || die "make failed"
+ use static && maketarget="static"
fi
+ emake ${maketarget} || die "make ${maketarget} failed"
}
src_install() {
@@ -49,7 +49,9 @@ src_install() {
dosym ${multibin} /usr/bin/dropbearconvert || die
dosym ../bin/${multibin} /usr/sbin/dropbear || die
else
- make install DESTDIR=${D} || die
+ local maketarget="install"
+ use static && maketarget="install-static"
+ make ${maketarget} DESTDIR=${D} || die "make ${maketarget} failed"
fi
exeinto /etc/init.d ; newexe ${FILESDIR}/dropbear.init.d dropbear
insinto /etc/conf.d ; newins ${FILESDIR}/dropbear.conf.d dropbear
diff --git a/net-misc/dropbear/dropbear-0.44_alpha4.ebuild b/net-misc/dropbear/dropbear-0.44_alpha4.ebuild
index d77e00474f5c..b72a81a94495 100644
--- a/net-misc/dropbear/dropbear-0.44_alpha4.ebuild
+++ b/net-misc/dropbear/dropbear-0.44_alpha4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.44_alpha4.ebuild,v 1.1 2004/09/22 19:00:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-0.44_alpha4.ebuild,v 1.2 2004/09/24 00:45:36 vapier Exp $
inherit gnuconfig eutils
@@ -29,19 +29,19 @@ src_unpack() {
src_compile() {
econf `use_enable zlib` || die
+ local maketarget=""
if use multicall ; then
sed -i \
-e '/define DROPBEAR_MULTI/s:/\* *::' \
-e '/define DROPBEAR_MULTI/s:\*/::' \
options.h
- if use static ; then
- emake dropbearmultistatic || die "multi static failed"
- else
- emake dropbearmulti || die "multi failed"
- fi
+ use static \
+ && maketarget="dropbearmultistatic" \
+ || maketarget="dropbearmulti"
else
- emake || die "make failed"
+ use static && maketarget="static"
fi
+ emake ${maketarget} || die "make ${maketarget} failed"
}
src_install() {
@@ -55,7 +55,9 @@ src_install() {
dosym ${multibin} /usr/bin/dbclient || die
dosym ../bin/${multibin} /usr/sbin/dropbear || die
else
- make install DESTDIR=${D} || die
+ local maketarget="install"
+ use static && maketarget="install-static"
+ make ${maketarget} DESTDIR=${D} || die "make ${maketarget} failed"
fi
exeinto /etc/init.d ; newexe ${FILESDIR}/dropbear.init.d dropbear
insinto /etc/conf.d ; newins ${FILESDIR}/dropbear.conf.d dropbear