Fix build with perl and --as-needed, triggered by perl 5.10

(Portage version: 2.2_rc44/cvs/Linux i686)

3 files changed, 108 insertions, 7 deletions

diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index 67a7c487bd93..3f5c9920bfad 100644
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/nvi
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.72 2009/09/26 08:47:51 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.73 2009/10/08 19:54:16 truedfx Exp $
+
+  06 Oct 2009; Harald van Dijk <truedfx@gentoo.org> nvi-1.81.6-r3.ebuild,
+  +files/nvi-1.81.6-perl-as-needed.patch:
+  Fix build with perl and --as-needed, triggered by perl 5.10
 
 *nvi-1.81.6-r3 (26 Sep 2009)
 
diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch b/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
new file mode 100644
index 000000000000..86f9883e6ce8
--- /dev/null
+++ b/app-editors/nvi/files/nvi-1.81.6-perl-as-needed.patch
@@ -0,0 +1,94 @@
+--- ../dist/configure.in
++++ ../dist/configure.in
+@@ -105,7 +105,7 @@
+ 
+ dnl A/UX has a broken getopt(3), strpbrk(3).
+ case "$host_os" in
+-aux*)	   LIBOBJS="getopt.o strpbrk.o $LIBOBJS";;
++aux*)	   LIBOBJS="libvi_la-getopt.o libvi_la-strpbrk.o $LIBOBJS";;
+ esac
+ 
+ dnl Ultrix has a broken POSIX.1 VDISABLE value.
+@@ -434,7 +434,7 @@
+         	-e 'ldopts'`
+ 	perlldflags=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
+         	-e 'ccdlflags'`
+-	LIBOBJS="perl.o perlxsi.o perlsfio.o $LIBOBJS"
++	LIBOBJS="libvi_la-perl.o libvi_la-perlxsi.o libvi_la-perlsfio.o $LIBOBJS"
+ 	AC_DEFINE(HAVE_PERL_INTERP)
+ 	AC_CACHE_CHECK([whether we need to use perl's setenv], 
+ 		vi_cv_perl_setenv, [
+@@ -471,7 +471,7 @@
+ 		AC_MSG_ERROR([No Tcl library found;])
+ 	fi
+ 	. $vi_cv_tclconfig
+-	LIBOBJS="tcl.o $LIBOBJS"
++	LIBOBJS="libvi_la-tcl.o $LIBOBJS"
+ 	LIBS="$TCL_LIB_SPEC $TCL_LIBS $LIBS"
+ 	AC_DEFINE(HAVE_TCL_INTERP)
+ fi
+@@ -607,12 +607,12 @@
+ 
+ dnl If we needed setenv or unsetenv, add in the clib/env.c replacement file.
+ if test "$need_env" = yes; then
+-	LIBOBJS="env.o $LIBOBJS"
++	LIBOBJS="libvi_la-env.o $LIBOBJS"
+ fi
+ 
+ dnl If we need strsep, add it and define it so we get a prototype.
+ if test "$need_strsep" = yes; then
+-	LIBOBJS="strsep.o $LIBOBJS"
++	LIBOBJS="libvi_la-strsep.o $LIBOBJS"
+ fi
+ 
+ dnl Check for fcntl/flock
+@@ -1003,7 +1003,7 @@
+ 	PATH="$OLDPATH"
+ 
+ 	AC_DEFINE(USE_DYNAMIC_LOADING)
+-	LIBOBJS="dldb.o $LIBOBJS"
++	LIBOBJS="libvi_la-dldb.o $LIBOBJS"
+ 	dl_src=../common/dldb.c
+ 	LIBS="-ldl $LIBS"
+ else
+@@ -1046,9 +1046,9 @@
+ 	CPPFLAGS="-I$vi_cv_dbsrc/include_auto $CPPFLAGS"
+ 	CPPFLAGS="-I$with_db_build $CPPFLAGS"
+ 	AC_DEFINE(USE_DB4_LOGGING)
+-	LIBOBJS="log4.o vi_auto.o vi_rec.o $LIBOBJS"
++	LIBOBJS="libvi_la-log4.o libvi_la-vi_auto.o libvi_la-vi_rec.o $LIBOBJS"
+ else
+-	LIBOBJS="log.o $LIBOBJS"
++	LIBOBJS="libvi_la-log.o $LIBOBJS"
+ fi
+ 
+ dnl We compile in nvi's RE routines unless the user specifies otherwise.
+@@ -1064,7 +1064,7 @@
+ case "$vi_cv_re_lib" in
+ "bundled RE")
+ 	CPPFLAGS="-I\$(visrcdir)/regex $CPPFLAGS"
+-	LIBOBJS="regcomp.o regerror.o regexec.o regfree.o $LIBOBJS";;
++	LIBOBJS="libvi_la-regcomp.o libvi_la-regerror.o libvi_la-regexec.o libvi_la-regfree.o $LIBOBJS";;
+ "other RE")
+ 	;;
+ esac
+--- ../dist/Makefile.am
++++ ../dist/Makefile.am
+@@ -169,12 +169,15 @@
+ 	$(visrcdir)/common/pthread.c \
+ 	$(visrcdir)/common/vi_auto.c \
+ 	$(visrcdir)/common/vi_rec.c \
+-	$(visrcdir)/perl_api/perl.xs \
++	perl.c \
+ 	$(visrcdir)/perl_api/perlsfio.c \
++	perlxsi.c \
+ 	$(visrcdir)/tcl_api/tcl.c
+ # Is this the way to do it ?
+ libvi_la_DEPENDENCIES = @LTLIBOBJS@
+-libvi_la_LIBADD = @LTLIBOBJS@
++libvi_la_LIBADD = @LTLIBOBJS@ @perllibs@
++libvi_la_CPPFLAGS = @perlldflags@ $(AM_CPPFLAGS)
++libvi_la_LDFLAGS = @perlldflags@
+ 
+ bin_PROGRAMS = @vi_programs@ @vi_ipc@
+ EXTRA_PROGRAMS = vi vi-ipc vi-motif vi-gtk
diff --git a/app-editors/nvi/nvi-1.81.6-r3.ebuild b/app-editors/nvi/nvi-1.81.6-r3.ebuild
index e71dac4a2c03..e99f4860980a 100644
--- a/app-editors/nvi/nvi-1.81.6-r3.ebuild
+++ b/app-editors/nvi/nvi-1.81.6-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.1 2009/09/26 08:47:51 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.2 2009/10/08 19:54:16 truedfx Exp $
 
-inherit db-use eutils flag-o-matic
+inherit autotools db-use eutils flag-o-matic
 
 DBVERS="4.7 4.6 4.5 4.4 4.3 4.2"
 
@@ -33,13 +33,16 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd "${S}" || die
 	epatch "${FILESDIR}"/${P}-db44.patch
 	epatch "${FILESDIR}"/${P}-db.patch
-	chmod +x ../dist/findconfig
-
+	epatch "${FILESDIR}"/${P}-perl-as-needed.patch
+	cd ../dist || die
+	chmod +x findconfig || die
 	append-flags -I"$(db_includedir ${DBVERS})"
-	sed -i -e "s@-ldb@-l$(db_libname ${DBVERS})@" ../dist/configure
+	sed -i -e "s@-ldb@-l$(db_libname ${DBVERS})@" configure.in || die
+	rm -f configure || die
+	eautoreconf -Im4
 }
 
 src_compile() {