summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-10-19 04:09:12 +0000
committerMike Frysinger <vapier@gentoo.org>2005-10-19 04:09:12 +0000
commit2396c043d8b427d8b587d186174555314eab38c7 (patch)
tree15b3e6fb2023552d3f332d3014198a6b93483a88 /dev-perl/sdl-perl
parentStable on x86, security bug #109097. (diff)
downloadgentoo-2-2396c043d8b427d8b587d186174555314eab38c7.tar.gz
gentoo-2-2396c043d8b427d8b587d186174555314eab38c7.tar.bz2
gentoo-2-2396c043d8b427d8b587d186174555314eab38c7.zip
Fix by Rodolfo Boer for build error #104221.
(Portage version: 2.0.53_rc5)
Diffstat (limited to 'dev-perl/sdl-perl')
-rw-r--r--dev-perl/sdl-perl/ChangeLog6
-rw-r--r--dev-perl/sdl-perl/files/sdl-perl-2.1.2-libpaths.patch18
-rw-r--r--dev-perl/sdl-perl/sdl-perl-2.1.2-r1.ebuild18
3 files changed, 39 insertions, 3 deletions
diff --git a/dev-perl/sdl-perl/ChangeLog b/dev-perl/sdl-perl/ChangeLog
index 215d457ebeef..8f52b28b3d3c 100644
--- a/dev-perl/sdl-perl/ChangeLog
+++ b/dev-perl/sdl-perl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-perl/sdl-perl
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/ChangeLog,v 1.19 2005/04/26 23:47:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/ChangeLog,v 1.20 2005/10/19 04:09:12 vapier Exp $
+
+ 19 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+ +files/sdl-perl-2.1.2-libpaths.patch, sdl-perl-2.1.2-r1.ebuild:
+ Fix by Rodolfo Boer for build error #104221.
*sdl-perl-1.20.3-r1 (26 Apr 2005)
diff --git a/dev-perl/sdl-perl/files/sdl-perl-2.1.2-libpaths.patch b/dev-perl/sdl-perl/files/sdl-perl-2.1.2-libpaths.patch
new file mode 100644
index 000000000000..07470da0e42e
--- /dev/null
+++ b/dev-perl/sdl-perl/files/sdl-perl-2.1.2-libpaths.patch
@@ -0,0 +1,18 @@
+If `sdl-config --libs` only outputs '-lSDL -lpthread', this code
+will try to link with '-lSDL -lpthread' instead of '-lSDL' '-lpthread'
+
+Patch by Rodolfo Boer.
+
+http://bugs.gentoo.org/104221
+
+--- SDL_Perl-2.1.2/make/lib/SDL/Build.pm
++++ SDL_Perl-2.1.2/make/lib/SDL/Build.pm
+@@ -150,7 +151,7 @@
+ extra_linker_flags =>
+ [
+ @{ $links->{$subsystem}{paths} },
+- $sdl_link,
++ split / /, $sdl_link,
+ @{ $links->{$subsystem}{libs} },
+ ],
+ },
diff --git a/dev-perl/sdl-perl/sdl-perl-2.1.2-r1.ebuild b/dev-perl/sdl-perl/sdl-perl-2.1.2-r1.ebuild
index 86f1ba59e8f6..fd575ee7d710 100644
--- a/dev-perl/sdl-perl/sdl-perl-2.1.2-r1.ebuild
+++ b/dev-perl/sdl-perl/sdl-perl-2.1.2-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/sdl-perl/sdl-perl-2.1.2-r1.ebuild,v 1.3 2005/03/16 16:07:43 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/sdl-perl/sdl-perl-2.1.2-r1.ebuild,v 1.4 2005/10/19 04:09:12 vapier Exp $
-inherit perl-module
+inherit perl-module eutils
DESCRIPTION="SDL binding for perl"
HOMEPAGE="http://sdl.perl.org/"
@@ -28,3 +28,17 @@ DEPEND="virtual/opengl
truetype? ( >=media-libs/sdl-ttf-2.0.5 )"
S=${WORKDIR}/SDL_Perl-${PV}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-libpaths.patch #104221
+}
+
+src_install() {
+ perl-module_src_install
+ # The build doesnt properly abort when there is an error
+ if [[ -z $(find "${D}" -name SDL.pm) ]] ; then
+ die "failed to install properly"
+ fi
+}