diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-08-04 03:59:52 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-08-04 03:59:52 +0000 |
| commit | ab4cf2cd1c5427206c0d90308facffd4b117b8f1 (patch) | |
| tree | 7634872836d53fec377fd47f4ad4f1c33d5cc9c1 /media-libs/libsdl/libsdl-1.2.8-r1.ebuild | |
| parent | rebuild patch against 1.2.8 (diff) | |
| download | historical-ab4cf2cd1c5427206c0d90308facffd4b117b8f1.tar.gz historical-ab4cf2cd1c5427206c0d90308facffd4b117b8f1.tar.bz2 historical-ab4cf2cd1c5427206c0d90308facffd4b117b8f1.zip | |
Make sure libsdl doesnt link against C++ since we dont need it and cleanup sdl-config output.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'media-libs/libsdl/libsdl-1.2.8-r1.ebuild')
| -rw-r--r-- | media-libs/libsdl/libsdl-1.2.8-r1.ebuild | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild b/media-libs/libsdl/libsdl-1.2.8-r1.ebuild index 147d63563b51..45a57d16fec0 100644 --- a/media-libs/libsdl/libsdl-1.2.8-r1.ebuild +++ b/media-libs/libsdl/libsdl-1.2.8-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/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.18 2005/07/12 05:12:00 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.8-r1.ebuild,v 1.19 2005/08/04 03:59:52 vapier Exp $ -inherit flag-o-matic toolchain-funcs eutils gnuconfig +inherit flag-o-matic toolchain-funcs eutils DESCRIPTION="Simple Direct Media Layer" HOMEPAGE="http://www.libsdl.org/" @@ -33,7 +33,7 @@ RDEPEND=">=media-libs/audiofile-0.1.9 DEPEND="${RDEPEND} x86? ( dev-lang/nasm )" -S="${WORKDIR}/SDL-${PV}" +S=${WORKDIR}/SDL-${PV} pkg_setup() { if use noaudio || use novideo || use nojoystick ; then @@ -56,8 +56,10 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PV}-nobuggy-X.patch #30089 - epatch "${FILESDIR}"/${PV}-libcaca.patch #40224 + epatch "${FILESDIR}"/${P}-libcaca.patch #40224 epatch "${FILESDIR}"/${PV}-gcc2.patch #75392 + epatch "${FILESDIR}"/${P}-sdl-config.patch + epatch "${FILESDIR}"/${P}-no-cxx.patch # This patch breaks compiling >-O0 on gcc4 ; bug #87809 [ "`gcc-major-version`" -lt "4" ] && epatch "${FILESDIR}"/${P}-gcc2.patch.bz2 #86481 @@ -69,24 +71,15 @@ src_unpack() { #build with -O0 to get it done) epatch "${FILESDIR}"/${PV}-gcc4.patch - if use nas && ! use X ; then #32447 - sed -i \ - -e 's:-laudio:-laudio -L/usr/X11R6/lib:' \ - configure.in || die "nas sed hack failed" - fi - ./autogen.sh || die "autogen failed" epunt_cxx - gnuconfig_update } src_compile() { local myconf= - - if use amd64 ; then - replace-flags -O? -O1 # bug #74608 - fi if use x86 ; then + # silly bundled asm triggers TEXTREL ... maybe someday + # i'll fix this properly, but for now hide with USE=pic use pic || myconf="${myconf} $(use_enable x86 nasm)" fi use noflagstrip || strip-flags |