diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-07-05 07:31:14 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-07-05 07:31:14 +0000 |
| commit | 5a806be04e24ebbbdc176ab269ae7212b560b942 (patch) | |
| tree | af5898ebd743edea638bbb6a62c31966d164def7 /net-misc | |
| parent | Install documentation. (diff) | |
| download | gentoo-2-5a806be04e24ebbbdc176ab269ae7212b560b942.tar.gz gentoo-2-5a806be04e24ebbbdc176ab269ae7212b560b942.tar.bz2 gentoo-2-5a806be04e24ebbbdc176ab269ae7212b560b942.zip | |
Respect LDFLAGS wrt bug 323919.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/nstx/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch | 19 | ||||
| -rw-r--r-- | net-misc/nstx/nstx-1.1_beta6-r3.ebuild | 21 |
3 files changed, 35 insertions, 11 deletions
diff --git a/net-misc/nstx/ChangeLog b/net-misc/nstx/ChangeLog index b84b97b8e739..3221acc56369 100644 --- a/net-misc/nstx/ChangeLog +++ b/net-misc/nstx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/nstx # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/ChangeLog,v 1.10 2010/05/30 16:34:53 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/ChangeLog,v 1.11 2010/07/05 07:31:13 xarthisius Exp $ + + 05 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org> + nstx-1.1_beta6-r3.ebuild, +files/nstx-1.1_beta6_05-respect-ldflags.patch: + Respect LDFLAGS wrt bug 323919. 30 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> nstx-1.1_beta6-r3.ebuild: diff --git a/net-misc/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch b/net-misc/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch new file mode 100644 index 000000000000..47edb029edb9 --- /dev/null +++ b/net-misc/nstx/files/nstx-1.1_beta6_05-respect-ldflags.patch @@ -0,0 +1,19 @@ +Respects LDFLAGS + +http://bugs.gentoo.org/show_bug.cgi?id=323919 + +--- nstx-1.1-beta6/Makefile ++++ nstx-1.1-beta6/Makefile +@@ -11,10 +11,10 @@ + all: $(PROGS) + + nstxd: $(NSTXD_OBJS) +- $(CC) $(CFLAGS) -o nstxd $(NSTXD_OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o nstxd $(NSTXD_OBJS) + + nstxcd: $(NSTXCD_OBJS) +- $(CC) $(CFLAGS) -o nstxcd $(NSTXCD_OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o nstxcd $(NSTXCD_OBJS) + + clean: + rm -f *.o $(PROGS) Makefile.bak *~ core diff --git a/net-misc/nstx/nstx-1.1_beta6-r3.ebuild b/net-misc/nstx/nstx-1.1_beta6-r3.ebuild index 0227c8f6d7d2..dd716a42ae5f 100644 --- a/net-misc/nstx/nstx-1.1_beta6-r3.ebuild +++ b/net-misc/nstx/nstx-1.1_beta6-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/nstx-1.1_beta6-r3.ebuild,v 1.2 2010/05/30 16:34:53 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/nstx/nstx-1.1_beta6-r3.ebuild,v 1.3 2010/07/05 07:31:13 xarthisius Exp $ inherit versionator toolchain-funcs eutils linux-info @@ -26,12 +26,13 @@ CONFIG_CHECK="~TUN" src_unpack() { unpack "${MY_P}.tgz" - epatch "${DISTDIR}"/${DEBIAN_A} - epatch "${FILESDIR}"/${PN}-1.1_beta6_00-linux-tuntap.patch - epatch "${FILESDIR}"/${PN}-1.1_beta6_01-bind-interface-name.patch - epatch "${FILESDIR}"/${PN}-1.1_beta6_02-warn-on-frag.patch - epatch "${FILESDIR}"/${PN}-1.1_beta6_03-delete-dwrite.patch - epatch "${FILESDIR}"/${PN}-1.1_beta6_04-delete-werror.patch + epatch "${DISTDIR}"/${DEBIAN_A} \ + "${FILESDIR}"/${PN}-1.1_beta6_00-linux-tuntap.patch \ + "${FILESDIR}"/${PN}-1.1_beta6_01-bind-interface-name.patch \ + "${FILESDIR}"/${PN}-1.1_beta6_02-warn-on-frag.patch \ + "${FILESDIR}"/${PN}-1.1_beta6_03-delete-dwrite.patch \ + "${FILESDIR}"/${PN}-1.1_beta6_04-delete-werror.patch \ + "${FILESDIR}"/${PN}-1.1_beta6_05-respect-ldflags.patch } src_compile() { @@ -40,9 +41,9 @@ src_compile() { src_install() { into /usr - dosbin nstxcd nstxd - dodoc README Changelog - doman *.8 + dosbin nstxcd nstxd || die + dodoc README Changelog || die + doman *.8 || die newinitd "${FILESDIR}"/nstxd.init nstxd newconfd "${FILESDIR}"/nstxd.conf nstxd |