From c06b1200f7f4ebd439b0eb6d20e17ff586be75ba Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Thu, 5 Feb 2004 08:22:15 +0000 Subject: Updated makefiles to play nice with user set CFLAGS --- media-plugins/xmms-imms/ChangeLog | 6 +++- media-plugins/xmms-imms/Manifest | 4 +-- .../xmms-imms/files/xmms-imms-1.0-makefile.patch | 33 ++++++++++++++++++++++ media-plugins/xmms-imms/xmms-imms-1.0.ebuild | 19 +++++++------ 4 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 media-plugins/xmms-imms/files/xmms-imms-1.0-makefile.patch (limited to 'media-plugins') diff --git a/media-plugins/xmms-imms/ChangeLog b/media-plugins/xmms-imms/ChangeLog index b5a0bf293ea6..ecbb27171920 100644 --- a/media-plugins/xmms-imms/ChangeLog +++ b/media-plugins/xmms-imms/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/xmms-imms # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.4 2004/01/27 19:23:42 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.5 2004/02/05 08:22:08 eradicator Exp $ + + 05 Feb 2004; Jeremy Huddleston xmms-imms-1.0.ebuild, + files/xmms-imms-1.0-makefile.patch: + Updated makefiles to play nice with user set CFLAGS *xmms-imms-1.0 (27 Jan 2004) diff --git a/media-plugins/xmms-imms/Manifest b/media-plugins/xmms-imms/Manifest index b1e6bca1fd9c..3147e4ead492 100644 --- a/media-plugins/xmms-imms/Manifest +++ b/media-plugins/xmms-imms/Manifest @@ -1,6 +1,6 @@ -MD5 9ad5034e11a9cc655f71dca69694a88d xmms-imms-1.0.ebuild 1025 +MD5 13c5633de9446bec7a820e3b21b28a4a xmms-imms-1.0.ebuild 1027 MD5 7fbdb805738072f72c25715a0b1bf741 xmms-imms-0.9.ebuild 945 -MD5 6561d683a116d6a88e9a471f152fa2ef ChangeLog 1019 +MD5 1fa93e915f0de801c2c9ddd8a8ef351d ChangeLog 1019 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 MD5 b60688238a3c495d789aebd07ac47536 xmms-imms-0.9.9.ebuild 1001 MD5 a8e4609e61ef28f2de2730e8bc335e88 files/digest-xmms-imms-0.9 60 diff --git a/media-plugins/xmms-imms/files/xmms-imms-1.0-makefile.patch b/media-plugins/xmms-imms/files/xmms-imms-1.0-makefile.patch new file mode 100644 index 000000000000..37ecdfe97f94 --- /dev/null +++ b/media-plugins/xmms-imms/files/xmms-imms-1.0-makefile.patch @@ -0,0 +1,33 @@ +--- rules.mk.orig 2004-02-04 23:59:29.000000000 -0800 ++++ rules.mk 2004-02-04 23:59:53.000000000 -0800 +@@ -11,12 +11,12 @@ + $(AR) $(ARFLAGS) $@ $(CORE_OBJ) + + %.o: %.cc vars.mk +- @$(CXX) $(CPPFLAGS) -M -E $< > .$*.d +- $(CXX) $(CPPFLAGS) -c $< -o $@ ++ @$(CXX) $(CPPFLAGS) $(CXXFLAGS) -M -E $< > .$*.d ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@ + + %.o: %.c vars.mk +- @$(CXX) $(CFLAGS) -M -E $< > .$*.d +- $(CC) $(CFLAGS) -c $< -o $@ ++ @$(CC) $(CPPFLAGS) $(CFLAGS) -M -E $< > .$*.d ++ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ + + .PHONY: clean distclean + +--- vars.mk.in.orig 2004-02-05 00:07:06.000000000 -0800 ++++ vars.mk.in 2004-02-05 00:08:00.000000000 -0800 +@@ -9,8 +9,9 @@ + CORE_OBJ = imms.o immsdb.o fetcher.o picker.o spectrum.o sqldb.o \ + songinfo.o regexx.o strmanip.o levenshtein.o xidle.o md5.o + +-CFLAGS = `xmms-config --cflags` @DEBUG_CFLAGS@ -Wall -fPIC -D_REENTRANT +-CPPFLAGS = ${CFLAGS} -pedantic -fno-rtti ++CFLAGS = -Wall -fPIC -D_REENTRANT @CFLAGS@ ++CXXFLAGS = -fPIC -D_REENTRANT -pedantic -fno-rtti @CXXFLAGS@ ++CPPFLAGS = `xmms-config --cflags` @CPPFLAGS@ + LDFLAGS = `xmms-config --libs` @LIBS@ + ARFLAGS = rs + diff --git a/media-plugins/xmms-imms/xmms-imms-1.0.ebuild b/media-plugins/xmms-imms/xmms-imms-1.0.ebuild index 4461c6b4ccf3..888eaa4340a4 100644 --- a/media-plugins/xmms-imms/xmms-imms-1.0.ebuild +++ b/media-plugins/xmms-imms/xmms-imms-1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-1.0.ebuild,v 1.2 2004/01/30 06:03:35 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-1.0.ebuild,v 1.3 2004/02/05 08:22:09 eradicator Exp $ MY_P=${P/xmms-/} @@ -18,22 +18,25 @@ RDEPEND=">=dev-db/sqlite-2.8 oggvorbis? ( >=media-libs/libvorbis-1.0 ) >=dev-libs/libpcre-4.3" -DEPEND="$RDEPEND >=sys-devel/autoconf-2.58" +DEPEND="$RDEPEND + >=sys-devel/autoconf-2.5 + >=sys-apps/sed-4.0.7" S=${WORKDIR}/${MY_P} -src_compile() { +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-makefile.patch + WANT_AUTOCONF=2.5 autoheader autoconf - - econf || die "configure failed" - - emake || die "make failed" } src_install () { exeinto "`xmms-config --visualization-plugin-dir`" doexe libimms.so || die - dodoc ChangeLog INSTALL README + dodoc INSTALL LICENSE README } -- cgit v1.2.3-65-gdbad