summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-09-04 10:20:56 +0000
committerMike Frysinger <vapier@gentoo.org>2006-09-04 10:20:56 +0000
commit5b901eac37722903b97cffdca1ace86d363ba391 (patch)
treef966d923b87fdf865e213d8fa6934dd91ddb9259 /net-ftp
parentstable on amd64 (diff)
downloadgentoo-2-5b901eac37722903b97cffdca1ace86d363ba391.tar.gz
gentoo-2-5b901eac37722903b97cffdca1ace86d363ba391.tar.bz2
gentoo-2-5b901eac37722903b97cffdca1ace86d363ba391.zip
Fix some parallel build issues #146214.
(Portage version: 2.1.1_rc1-r3)
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/ncftp/ChangeLog6
-rw-r--r--net-ftp/ncftp/files/ncftp-3.1.9-build.patch43
-rw-r--r--net-ftp/ncftp/ncftp-3.1.9.ebuild3
3 files changed, 50 insertions, 2 deletions
diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index 06abb7d83419..ea28a2d4a53c 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/ncftp
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.49 2006/09/04 09:25:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.50 2006/09/04 10:20:55 vapier Exp $
+
+ 04 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/ncftp-3.1.9-build.patch, ncftp-3.1.9.ebuild:
+ Fix some parallel build issues #146214.
*ncftp-3.2.0 (04 Sep 2006)
diff --git a/net-ftp/ncftp/files/ncftp-3.1.9-build.patch b/net-ftp/ncftp/files/ncftp-3.1.9-build.patch
new file mode 100644
index 000000000000..d6d45b9ab0dc
--- /dev/null
+++ b/net-ftp/ncftp/files/ncftp-3.1.9-build.patch
@@ -0,0 +1,43 @@
+Fix parallel build bugs
+
+http://bugs.gentoo.org/146214
+
+--- sio/Makefile.in
++++ sio/Makefile.in
+@@ -179,6 +179,7 @@
+ SClose.o: SClose.c $(SYSHDRS_DEP)
+ SConnect.o: SConnect.c $(SYSHDRS_DEP)
+ SConnectByName.o: SConnectByName.c $(SYSHDRS_DEP)
++SError.o: SError.c $(SYSHDRS_DEP)
+ SNew.o: SNew.c $(SYSHDRS_DEP)
+ SRead.o: SRead.c $(SYSHDRS_DEP)
+ SReadline.o: SReadline.c $(SYSHDRS_DEP)
+--- sio/pch.mk.gcc-gch
++++ sio/pch.mk.gcc-gch
+@@ -1,5 +1,6 @@
+ syshdrs.h.gch: syshdrs.h sio.h usio.h
+- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h -o .tmp.$@
++ mv -f .tmp.$@ $@
+
+ PCH=syshdrs.h.gch
+ SYSHDRS_DEP=syshdrs.h.gch
+--- libncftp/Makefile.in
++++ libncftp/Makefile.in
+@@ -353,3 +353,6 @@
+
+ u_unmdtm.o: u_unmdtm.c $(SYSHDRS_DEP)
+ u_unmdtm.so: u_unmdtm.c $(SYSHDRS_DEP)
++
++u_feat.o: u_feat.c $(SYSHDRS_DEP)
++u_feat.so: u_feat.c $(SYSHDRS_DEP)
+--- libncftp/pch.mk.gcc-gch
++++ libncftp/pch.mk.gcc-gch
+@@ -1,5 +1,6 @@
+ syshdrs.h.gch: syshdrs.h ncftp.h ncftp_errno.h util.h ftp.h
+- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) syshdrs.h -o .tmp.$@
++ mv -f .tmp.$@ $@
+
+ PCH=syshdrs.h.gch
+ SYSHDRS_DEP=syshdrs.h.gch
diff --git a/net-ftp/ncftp/ncftp-3.1.9.ebuild b/net-ftp/ncftp/ncftp-3.1.9.ebuild
index 604b2ed46d26..7ffa3e76b858 100644
--- a/net-ftp/ncftp/ncftp-3.1.9.ebuild
+++ b/net-ftp/ncftp/ncftp-3.1.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.9.ebuild,v 1.11 2006/07/20 18:55:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.9.ebuild,v 1.12 2006/09/04 10:20:55 vapier Exp $
inherit eutils
@@ -23,6 +23,7 @@ src_unpack() {
cd "${S}"
# use ipv6 && epatch ${DISTDIR}/${IPV6_P}.diff.gz
epatch "${DISTDIR}"/ncftp-${PV}_editcmd.patch
+ epatch "${FILESDIR}"/ncftp-${PV}-build.patch
}
src_install() {