diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2004-07-17 01:28:13 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2004-07-17 01:28:13 +0000 |
| commit | f25be030345fbfc79f320392d37d5fe43a9226cf (patch) | |
| tree | 91e65d9d5884eca5cf8498701a8a005f5e7d03c9 /sys-apps/tcp-wrappers | |
| parent | gnuconfig_update in src_unpack; use emake; tidy; clean older ebuilds (Manifes... (diff) | |
| download | gentoo-2-f25be030345fbfc79f320392d37d5fe43a9226cf.tar.gz gentoo-2-f25be030345fbfc79f320392d37d5fe43a9226cf.tar.bz2 gentoo-2-f25be030345fbfc79f320392d37d5fe43a9226cf.zip | |
error check sed; use emake; modify Makefile to make parallel-friendly
Diffstat (limited to 'sys-apps/tcp-wrappers')
| -rw-r--r-- | sys-apps/tcp-wrappers/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild | 23 |
2 files changed, 21 insertions, 8 deletions
diff --git a/sys-apps/tcp-wrappers/ChangeLog b/sys-apps/tcp-wrappers/ChangeLog index 90a6c66f5d51..b1598938ea75 100644 --- a/sys-apps/tcp-wrappers/ChangeLog +++ b/sys-apps/tcp-wrappers/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/tcp-wrappers # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.32 2004/07/01 21:40:36 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.33 2004/07/17 01:28:13 mr_bones_ Exp $ + + 16 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> + tcp-wrappers-7.6-r8.ebuild: + error check sed; use emake; modify Makefile to make parallel-friendly 01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> tcp-wrappers-7.6-r3.ebuild, tcp-wrappers-7.6-r4.ebuild, diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild index 8c7d16fb1ef3..8192dcc1c5ff 100644 --- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild +++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.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/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.14 2004/07/01 21:40:36 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r8.ebuild,v 1.15 2004/07/17 01:28:13 mr_bones_ Exp $ inherit eutils @@ -26,9 +26,11 @@ src_unpack() { cd ${S} chmod ug+w Makefile - sed -i -e "s:-O:${CFLAGS}:" \ + sed -i \ + -e "s:-O:${CFLAGS}:" \ -e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" \ - Makefile + Makefile \ + || die "sed Makefile failed" PATCHDIR=${WORKDIR}/${PV}-patches @@ -38,6 +40,13 @@ src_unpack() { use static || epatch ${PATCHDIR}/${P}-shared.patch.bz2 use ipv6 && epatch ${PATCHDIR}/${P}-ipv6-1.14.diff.bz2 + + # make it parallel-friendly. + sed -i \ + -e 's:@make :@$(MAKE) :' \ + -e 's:make;:$(MAKE);:' \ + Makefile \ + || die "sed Makefile failed" } src_compile() { @@ -46,17 +55,17 @@ src_compile() { use static || myconf="${myconf} -DHAVE_WEAKSYMS" use ipv6 && myconf="${myconf} -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len" - make ${MAKEOPTS} \ + emake \ REAL_DAEMON_DIR=/usr/sbin \ GENTOO_OPT="${myconf}" \ MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \ - config-check || die + config-check || die "emake config-check failed" - make ${MAKEOPTS} \ + emake \ REAL_DAEMON_DIR=/usr/sbin \ GENTOO_OPT="${myconf}" \ MAJOR=0 MINOR=${PV:0:1} REL=${PV:2:3} \ - linux || die + linux || die "emake linux failed" } src_install() { |