summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2004-08-12 11:52:20 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2004-08-12 11:52:20 +0000
commit89d00df899a24208f8e671b59a8188309a89ddc1 (patch)
treec5174fcc7d3261fed52d46893ae8c459be91d469 /media-libs
parentVersion bump. (diff)
downloadhistorical-89d00df899a24208f8e671b59a8188309a89ddc1.tar.gz
historical-89d00df899a24208f8e671b59a8188309a89ddc1.tar.bz2
historical-89d00df899a24208f8e671b59a8188309a89ddc1.zip
remove the prototype for malloc for gcc34 (bug #58279); error check sed; tidy
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/allegro/ChangeLog5
-rw-r--r--media-libs/allegro/Manifest4
-rw-r--r--media-libs/allegro/allegro-4.0.3.ebuild50
3 files changed, 34 insertions, 25 deletions
diff --git a/media-libs/allegro/ChangeLog b/media-libs/allegro/ChangeLog
index 2b64f57a1ba5..3ee5b7e4e26f 100644
--- a/media-libs/allegro/ChangeLog
+++ b/media-libs/allegro/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/allegro
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.26 2004/08/12 02:20:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/ChangeLog,v 1.27 2004/08/12 11:52:20 mr_bones_ Exp $
+
+ 12 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> allegro-4.0.3.ebuild:
+ remove the prototype for malloc for gcc34 (bug #58279); error check sed; tidy
*allegro-4.1.15 (11 Aug 2004)
diff --git a/media-libs/allegro/Manifest b/media-libs/allegro/Manifest
index 1543d14faf4f..486022d6e879 100644
--- a/media-libs/allegro/Manifest
+++ b/media-libs/allegro/Manifest
@@ -1,5 +1,5 @@
-MD5 bae24c6fb9163aa09a308909d6cddad3 ChangeLog 3867
-MD5 94af5b168c06f358d51e4183c400330d allegro-4.0.3.ebuild 2029
+MD5 dc288b54d9ebfed0735f390301d65649 ChangeLog 4025
+MD5 3703368fda6efbe1b7f0dcbeccddd67c allegro-4.0.3.ebuild 2144
MD5 69afb3c206fdd20a361ee6dbff286ace metadata.xml 636
MD5 6291d6b55f7384f34f5d38cfc0f179f8 allegro-4.1.14.ebuild 2001
MD5 4b3641846133cab138eb29b15d7310e3 allegro-4.1.15.ebuild 1967
diff --git a/media-libs/allegro/allegro-4.0.3.ebuild b/media-libs/allegro/allegro-4.0.3.ebuild
index 8c9588492195..bf11a1e33727 100644
--- a/media-libs/allegro/allegro-4.0.3.ebuild
+++ b/media-libs/allegro/allegro-4.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.0.3.ebuild,v 1.9 2004/06/24 22:55:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.0.3.ebuild,v 1.10 2004/08/12 11:52:20 mr_bones_ Exp $
inherit flag-o-matic
@@ -23,7 +23,12 @@ DEPEND="${RDEPEND}
src_unpack() {
unpack ${A}
- sed -i '/TARGET_ARCH=/s:=.*:=:' ${S}/configure || die 'couldnt remove pentium cpu'
+ # remove the prototype for malloc for gcc34 (bug #58279)
+ sed -i \
+ -e '/*malloc/d' \
+ -e '/TARGET_ARCH=/s:=.*:=:' \
+ ${S}/configure \
+ || die 'couldnt remove pentium cpu'
}
src_compile() {
@@ -31,28 +36,29 @@ src_compile() {
econf \
--enable-linux \
--enable-vga \
- `use_enable static` \
- `use_enable static staticprog` \
- `use_enable mmx` \
- `use_enable sse` \
- `use_enable oss ossdigi` \
- `use_enable oss ossmidi` \
- `use_enable alsa alsadigi` \
- `use_enable alsa alsamidi` \
- `use_enable esd esddigi` \
- `use_enable arts artsdigi` \
- `use_with X x` \
- `use_enable X xwin-shm` \
- `use_enable X xwin-vidmode` \
- `use_enable X xwin-dga` \
- `use_enable X xwin-dga2` \
- `use_enable fbcon` \
- `use_enable svga svgalib` \
+ $(use_enable static) \
+ $(use_enable static staticprog) \
+ $(use_enable mmx) \
+ $(use_enable sse) \
+ $(use_enable oss ossdigi) \
+ $(use_enable oss ossmidi) \
+ $(use_enable alsa alsadigi) \
+ $(use_enable alsa alsamidi) \
+ $(use_enable esd esddigi) \
+ $(use_enable arts artsdigi) \
+ $(use_with X x) \
+ $(use_enable X xwin-shm) \
+ $(use_enable X xwin-vidmode) \
+ $(use_enable X xwin-dga) \
+ $(use_enable X xwin-dga2) \
+ $(use_enable fbcon) \
+ $(use_enable svga svgalib) \
|| die
- cp makefile{,.orig}
- sed -e "/CFLAGS =.*/s:$: ${CFLAGS}:" \
- makefile.orig > makefile
+ sed -i \
+ -e "/CFLAGS =.*/s:$: ${CFLAGS}:" \
+ makefile \
+ || die "sed makefile failed"
emake -j1 || die # parallel fails
if use tetex ; then