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
commit9af587d243a418a2e08bd7e20f4c37da54494cc7 (patch)
tree87e960dbe33c265a2270117c6ee3ab1722e9abd6
parentStable on x86, security bug #109097. (diff)
downloadhistorical-9af587d243a418a2e08bd7e20f4c37da54494cc7.tar.gz
historical-9af587d243a418a2e08bd7e20f4c37da54494cc7.tar.bz2
historical-9af587d243a418a2e08bd7e20f4c37da54494cc7.zip
Fix by Rodolfo Boer for build error #104221.
Package-Manager: portage-2.0.53_rc5
-rw-r--r--dev-perl/sdl-perl/ChangeLog6
-rw-r--r--dev-perl/sdl-perl/Manifest21
-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
4 files changed, 55 insertions, 8 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/Manifest b/dev-perl/sdl-perl/Manifest
index 3b6cdb92b746..5be627c090c8 100644
--- a/dev-perl/sdl-perl/Manifest
+++ b/dev-perl/sdl-perl/Manifest
@@ -1,7 +1,18 @@
-MD5 221818389bbcf920a92c5a3296494a83 ChangeLog 5332
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d2c89c30a78d43f315897e39a6d167c4 ChangeLog 5496
+MD5 000eb623a9e2ce37c9e3efd665f6e5c2 files/digest-sdl-perl-1.20.3-r1 67
+MD5 8f817948159607a1ed78a8b839f5ce9b files/digest-sdl-perl-2.1.2-r1 66
+MD5 72ae0cc47c5672c970fa5aa9557fe555 files/sdl-perl-1.20.3-pie-typo.patch 578
+MD5 d3c54b1ec66a374f2d2e24124aee1ee3 files/sdl-perl-2.1.2-libpaths.patch 460
MD5 709cd2696c593abb0a2090e0640315f6 metadata.xml 176
-MD5 c30699292bc3948accdfd007e38cab1c sdl-perl-2.1.2-r1.ebuild 925
MD5 78dfe631b6600ced14e912a9d01142d0 sdl-perl-1.20.3-r1.ebuild 751
-MD5 72ae0cc47c5672c970fa5aa9557fe555 files/sdl-perl-1.20.3-pie-typo.patch 578
-MD5 8f817948159607a1ed78a8b839f5ce9b files/digest-sdl-perl-2.1.2-r1 66
-MD5 000eb623a9e2ce37c9e3efd665f6e5c2 files/digest-sdl-perl-1.20.3-r1 67
+MD5 097686a60897e207eb3e66515e19ee2d sdl-perl-2.1.2-r1.ebuild 1210
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVceGgIKl8Uu19MoRAulFAJ9nhg7yM7MNyRHVRugefgHHdTUROACeJvwv
+/35Ai2fJFryuiNBGF5f5A2E=
+=8WiR
+-----END PGP SIGNATURE-----
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
+}