Make glame honor user CFLAGS. Closes bug #67070.

diff --git a/media-sound/glame/ChangeLog b/media-sound/glame/ChangeLog
index f25068133f610c8e754410524af008ec34d3a396..f8637416e2de45442bee50418bcb2b7e0c6ca8c9 100644 (file)
--- a/media-sound/glame/ChangeLog
+++ b/media-sound/glame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/glame
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.21 2004/09/14 08:09:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.22 2004/10/15 08:59:03 eradicator Exp $
+
+  15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/glame-1.0.2-cflags.patch:
+  Make glame honor user CFLAGS.  Closes bug #67070.
 
   14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> glame-1.0.2.ebuild:
   Stable amd64, sparc.

diff --git a/media-sound/glame/Manifest b/media-sound/glame/Manifest
index 213864c2c884834323a968879f578f8be7cfe5b9..e21c786f6d392a9737361d7b6a26640f266695fd 100644 (file)
--- a/media-sound/glame/Manifest
+++ b/media-sound/glame/Manifest
@@ -1,11 +1,22 @@
-MD5 edabf5fea92f6d4887334f79392fb71b ChangeLog 3133
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0a1b73247d7b1845690c40703f17a157 ChangeLog 3278
 MD5 0af87663519385c03509b55cd192dac8 glame-0.6.3.ebuild 1699
 MD5 4d1c8a77b665b7451476b1bcdb95dcc4 glame-0.6.4.ebuild 1802
 MD5 b7d5a9d4a637f41c70c7bceb41e1ed3a glame-1.0.1.ebuild 1880
-MD5 5349e8f531ef51ead0c63f2497162835 glame-1.0.2.ebuild 2247
+MD5 b3b77d1cdd8524a8dbff1272a27ed1e1 glame-1.0.2.ebuild 2284
 MD5 552d4fdf9e391a7631494186974bdb80 metadata.xml 266
 MD5 0f9e060b52d269fd1c243646143605e1 files/digest-glame-0.6.3 64
 MD5 fcefae48a292c979f6c45a0bccafe745 files/digest-glame-0.6.4 64
 MD5 6d37da48379bb5a16ffc8f3e9ca2febd files/digest-glame-1.0.1 64
 MD5 f96064bc6c40df179eea7502e0999af8 files/digest-glame-1.0.2 64
 MD5 1414bd1790705dfed4d11d93033cbda8 files/gentoo.patch 1532
+MD5 992f68dfecc733f0bbb14079e1a70f3a files/glame-1.0.2-cflags.patch 1063
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBb5FjArHZZzCEUG0RAlESAJ47Sh2P5YWOgXY1dqamRNJuG6eo2QCeIXi1
+ypJfyXr01JvJnnhzTuxwjZE=
+=xqxu
+-----END PGP SIGNATURE-----

diff --git a/media-sound/glame/files/glame-1.0.2-cflags.patch b/media-sound/glame/files/glame-1.0.2-cflags.patch
new file mode 100644 (file)
index 0000000..488871d
--- /dev/null
+++ b/media-sound/glame/files/glame-1.0.2-cflags.patch
@@ -0,0 +1,30 @@
+diff -Naur glame-1.0.2.orig/configure glame-1.0.2.cflags/configure
+--- glame-1.0.2.orig/configure 2004-10-15 01:45:17.713874000 -0700
++++ glame-1.0.2.cflags/configure       2004-10-15 01:52:33.089150474 -0700
+@@ -1994,7 +1994,10 @@
+ #define NDEBUG
+ _ACEOF
+ 
+-      glame_debug_gcc_cflags="-O3 -ffast-math -funroll-loops"
++      if test -z "$CFLAGS"; then
++              CFLAGS="-O2 -ffast-math -funroll-loops"
++      fi
++      glame_debug_gcc_cflags="$CFLAGS"
+ else
+       if test -z "$CFLAGS"; then
+               CFLAGS="-g -O2 -ffast-math"
+diff -Naur glame-1.0.2.orig/configure.ac glame-1.0.2.cflags/configure.ac
+--- glame-1.0.2.orig/configure.ac      2004-01-13 11:54:26.000000000 -0800
++++ glame-1.0.2.cflags/configure.ac    2004-10-15 01:51:48.394512522 -0700
+@@ -33,7 +33,10 @@
+       glame_debug_gcc_cflags="-g3 -O"
+ elif test "$glame_debug" = "no"; then
+       AC_DEFINE(NDEBUG,, [disable debugging code])
+-      glame_debug_gcc_cflags="-O3 -ffast-math -funroll-loops"
++      if test -z "$CFLAGS"; then
++              CFLAGS="-O2 -ffast-math"
++      fi
++      glame_debug_gcc_cflags="$CFLAGS"
+ else
+       if test -z "$CFLAGS"; then
+               CFLAGS="-g -O2 -ffast-math"

diff --git a/media-sound/glame/glame-1.0.2.ebuild b/media-sound/glame/glame-1.0.2.ebuild
index a08eb44da2cdd3e9332575588b16ecb34aa7c7c5..4b824af71b1e6dfc85f3dfbaea658e4d8b9a91bf 100644 (file)
--- a/media-sound/glame/glame-1.0.2.ebuild
+++ b/media-sound/glame/glame-1.0.2.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-sound/glame/glame-1.0.2.ebuild,v 1.10 2004/09/14 08:09:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-1.0.2.ebuild,v 1.11 2004/10/15 08:59:03 eradicator Exp $
 
 IUSE="nls gnome oggvorbis debug alsa"
 
@@ -31,7 +31,6 @@ DEPEND="${RDEPEND}
        >=sys-devel/autoconf-2.58
        nls? ( >=sys-devel/gettext-0.11.3 )"
 
-
 src_unpack() {
        unpack ${A}
 
@@ -50,6 +49,7 @@ src_unpack() {
 
        cd ${S}
        epatch ${FILESDIR}/gentoo.patch
+       epatch ${FILESDIR}/${P}-cflags.patch
 }
 
 src_compile() {