diff options
author | Simon Stelling <blubb@gentoo.org> | 2005-09-07 20:15:55 +0000 |
---|---|---|
committer | Simon Stelling <blubb@gentoo.org> | 2005-09-07 20:15:55 +0000 |
commit | ac293eb4278f0090c3290b1dcf12861b5abdb472 (patch) | |
tree | 9bcb43a97d934864cbdc5993370b1ab1f23cb400 /dev-perl/PerlQt | |
parent | Forcing -j1. Found -j3 making problems on my u2 =(... (diff) | |
download | gentoo-2-ac293eb4278f0090c3290b1dcf12861b5abdb472.tar.gz gentoo-2-ac293eb4278f0090c3290b1dcf12861b5abdb472.tar.bz2 gentoo-2-ac293eb4278f0090c3290b1dcf12861b5abdb472.zip |
adding missing emake in src_compile to make sure it doesn't compile in src_install, fixing bug 104685
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-perl/PerlQt')
-rw-r--r-- | dev-perl/PerlQt/ChangeLog | 8 | ||||
-rw-r--r-- | dev-perl/PerlQt/PerlQt-3.008-r1.ebuild | 7 | ||||
-rw-r--r-- | dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild | 4 | ||||
-rw-r--r-- | dev-perl/PerlQt/files/PerlQt-3.008-fPIC.patch | 11 |
4 files changed, 26 insertions, 4 deletions
diff --git a/dev-perl/PerlQt/ChangeLog b/dev-perl/PerlQt/ChangeLog index e590202f6bad..87b4e6938869 100644 --- a/dev-perl/PerlQt/ChangeLog +++ b/dev-perl/PerlQt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-perl/PerlQt # Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/ChangeLog,v 1.17 2005/08/07 13:05:25 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/ChangeLog,v 1.18 2005/09/07 20:15:55 blubb Exp $ + + 07 Sep 2005; Simon Stelling <blubb@gentoo.org> + +files/PerlQt-3.008-fPIC.patch, PerlQt-3.008-r1.ebuild, + PerlQt-3.009_beta1.ebuild: + adding missing emake in src_compile to make sure it doesn't compile in + src_install, fixing bug 104685 07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> PerlQt-3.008-r1.ebuild: diff --git a/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild b/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild index 04adad047711..aea33ddce22c 100644 --- a/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild +++ b/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild,v 1.8 2005/08/07 13:05:25 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/PerlQt-3.008-r1.ebuild,v 1.9 2005/09/07 20:15:55 blubb Exp $ -inherit perl-module kde +inherit perl-module kde eutils #install pqtsh to this directory myinst="${myinst} INSTBINDIR=${D}/usr/bin" @@ -29,11 +29,14 @@ src_unpack() { cp Makefile.PL.in Makefile.PL.in.orig perl -pi -e "s#WriteMakefile\(#WriteMakefile\(\n'PREFIX' => '${D}/usr',#" Makefile.PL.in cd ${S} + epatch ${FILESDIR}/${P}-fPIC.patch } src_compile() { addwrite $QTDIR/etc/settings perl-module_src_prep + + emake } src_install() { diff --git a/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild b/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild index 433d162a25bc..8031df0c90b8 100644 --- a/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild +++ b/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild,v 1.1 2005/07/07 13:28:15 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/PerlQt/PerlQt-3.009_beta1.ebuild,v 1.2 2005/09/07 20:15:55 blubb Exp $ inherit perl-module kde @@ -36,6 +36,8 @@ src_compile() { useq arts || myconf="${myconf} --without-arts" addwrite $QTDIR/etc/settings perl-module_src_prep + + emake } src_install() { diff --git a/dev-perl/PerlQt/files/PerlQt-3.008-fPIC.patch b/dev-perl/PerlQt/files/PerlQt-3.008-fPIC.patch new file mode 100644 index 000000000000..35d749c320cf --- /dev/null +++ b/dev-perl/PerlQt/files/PerlQt-3.008-fPIC.patch @@ -0,0 +1,11 @@ +--- smoke/qt/Makefile.in.old 2005-09-07 21:41:03.000000000 +0200 ++++ smoke/qt/Makefile.in 2005-09-07 21:41:23.000000000 +0200 +@@ -55,7 +55,7 @@ + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ ++CXXFLAGS = @CXXFLAGS@ -fPIC + CYGPATH_W = @CYGPATH_W@ + DEFS = @DEFS@ + DEPDIR = @DEPDIR@ |