diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-10-17 11:53:51 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-10-17 11:53:51 +0000 |
| commit | b5fc910f202d245f42e9301a34299ae91fba94e8 (patch) | |
| tree | fa4ddfc2c8b44783027a0289174f38002b6aca1a /media-sound/mpg123 | |
| parent | Make sure user-defined compiler, CXXFLAGS and useflags are respected (fixes b... (diff) | |
| download | gentoo-2-b5fc910f202d245f42e9301a34299ae91fba94e8.tar.gz gentoo-2-b5fc910f202d245f42e9301a34299ae91fba94e8.tar.bz2 gentoo-2-b5fc910f202d245f42e9301a34299ae91fba94e8.zip | |
Added patch to respect user-defined CFLAGS on amd64. Patch by Simon Strandman in bug #87539.
(Portage version: 2.0.53_rc5)
Diffstat (limited to 'media-sound/mpg123')
| -rw-r--r-- | media-sound/mpg123/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/mpg123/files/mpg123-respectusercflags.patch | 29 | ||||
| -rw-r--r-- | media-sound/mpg123/mpg123-0.59s-r10.ebuild | 5 |
3 files changed, 39 insertions, 2 deletions
diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog index 212bdc1676f1..4962061c3a18 100644 --- a/media-sound/mpg123/ChangeLog +++ b/media-sound/mpg123/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/mpg123 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.90 2005/09/02 12:55:47 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.91 2005/10/17 11:53:51 flameeyes Exp $ + + 17 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/mpg123-respectusercflags.patch, mpg123-0.59s-r10.ebuild: + Added patch to respect user-defined CFLAGS on amd64. Patch by Simon + Strandman in bug #87539. 02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> mpg123-0.59s-r8.ebuild, mpg123-0.59s-r9.ebuild, mpg123-0.59s-r10.ebuild: diff --git a/media-sound/mpg123/files/mpg123-respectusercflags.patch b/media-sound/mpg123/files/mpg123-respectusercflags.patch new file mode 100644 index 000000000000..6d3c1edf1779 --- /dev/null +++ b/media-sound/mpg123/files/mpg123-respectusercflags.patch @@ -0,0 +1,29 @@ +--- Makefile 2005-04-01 13:35:32.000000000 +0200 ++++ Makefile.fix 2005-04-01 13:35:45.000000000 +0200 +@@ -330,7 +330,7 @@ + linux-x86_64: + $(MAKE) LDFLAGS= \ + OBJECTS='decode.o dct64.o audio_oss.o' \ +- CFLAGS=' -Wall -DLINUX -DOSS -DUSE_MMAP \ ++ CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP \ + $(RPM_OPT_FLAGS)' \ + mpg123-make + +@@ -338,7 +338,7 @@ + $(MAKE) LDFLAGS= \ + AUDIO_LIB='-lesd -laudiofile' \ + OBJECTS='decode.o dct64.o audio_esd.o' \ +- CFLAGS=' -Wall -DLINUX -DOSS -DUSE_MMAP \ ++ CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP \ + $(RPM_OPT_FLAGS)' \ + mpg123-make + +@@ -346,7 +346,7 @@ + $(MAKE) LDFLAGS= \ + AUDIO_LIB='-lasound' \ + OBJECTS='decode.o dct64.o audio_alsa.o' \ +- CFLAGS=' -Wall -DLINUX -DOSS -DUSE_MMAP \ ++ CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP \ + $(RPM_OPT_FLAGS)' \ + mpg123-make + diff --git a/media-sound/mpg123/mpg123-0.59s-r10.ebuild b/media-sound/mpg123/mpg123-0.59s-r10.ebuild index 2f26d0310265..163347e3600d 100644 --- a/media-sound/mpg123/mpg123-0.59s-r10.ebuild +++ b/media-sound/mpg123/mpg123-0.59s-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r10.ebuild,v 1.2 2005/09/02 12:55:47 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r10.ebuild,v 1.3 2005/10/17 11:53:51 flameeyes Exp $ inherit eutils @@ -42,6 +42,9 @@ src_unpack() { # Bug #70592; terminal line settings should only be set once; not everytime a new song starts epatch ${FILESDIR}/${PV}-set-terminal-line-settings-once.patch + # Bug #87539; user CFLAGS are not respected on amd64 + epatch ${FILESDIR}/${PN}-respectusercflags.patch + if use ppc-macos; then einfo "Patching for OSX build" |