diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-06-19 07:12:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-06-19 07:12:30 +0000 |
| commit | 77ae6daaf194ac1dc0eccc2db1268da020f55db6 (patch) | |
| tree | 317e49a3f9f4b56a7e3a53ceff0494ebc48178b2 /media-libs/svgalib | |
| parent | Version bumped. Added dispatch-conf(1) and g-cpan.pl(1) (Manifest recommit) (diff) | |
| download | gentoo-2-77ae6daaf194ac1dc0eccc2db1268da020f55db6.tar.gz gentoo-2-77ae6daaf194ac1dc0eccc2db1268da020f55db6.tar.bz2 gentoo-2-77ae6daaf194ac1dc0eccc2db1268da020f55db6.zip | |
fix include bug #54198
Diffstat (limited to 'media-libs/svgalib')
4 files changed, 34 insertions, 2 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index 3b456526b1a5..3968bf542b16 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/svgalib # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.38 2004/06/07 23:01:38 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.39 2004/06/19 07:12:30 vapier Exp $ + + 19 Jun 2004; Mike Frysinger <vapier@gentoo.org> + +files/svgalib-1.9.18-lrmi-gentoo-cflags.patch, + +files/svgalib-1.9.18-utils-include.patch, svgalib-1.9.18-r1.ebuild: + Make sure the gcc always runs with $CFLAGS to fix #54198 by Simon Strandman + and add a small patch so lrmi uses our $CFLAGS instead of -g. 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> svgalib-1.9.17-r3.ebuild: Fix use invocation diff --git a/media-libs/svgalib/files/svgalib-1.9.18-lrmi-gentoo-cflags.patch b/media-libs/svgalib/files/svgalib-1.9.18-lrmi-gentoo-cflags.patch new file mode 100644 index 000000000000..2bddb4a1b7ce --- /dev/null +++ b/media-libs/svgalib/files/svgalib-1.9.18-lrmi-gentoo-cflags.patch @@ -0,0 +1,9 @@ +--- svgalib-1.9.18/lrmi-0.6m/Makefile.orig 2004-06-19 02:48:08.112742704 -0400 ++++ svgalib-1.9.18/lrmi-0.6m/Makefile 2004-06-19 02:48:23.471407832 -0400 +@@ -1,4 +1,5 @@ +-CFLAGS = -g -Wall ++OPTIMIZE = -g -Wall ++CFLAGS = $(OPTIMIZE) + + sources = lrmi.c + objects = lrmi.o diff --git a/media-libs/svgalib/files/svgalib-1.9.18-utils-include.patch b/media-libs/svgalib/files/svgalib-1.9.18-utils-include.patch new file mode 100644 index 000000000000..954d3f33d538 --- /dev/null +++ b/media-libs/svgalib/files/svgalib-1.9.18-utils-include.patch @@ -0,0 +1,11 @@ +--- svgalib-1.9.18/utils/Makefile.orig 2004-06-19 02:41:48.628433088 -0400 ++++ svgalib-1.9.18/utils/Makefile 2004-06-19 02:42:00.532623376 -0400 +@@ -56,7 +56,7 @@ + $(INSTALLPROG) $(UTILPROGS) $(UTILINSTALLDIR) + + .depend: +- gcc -MM $(patsubst %.o,$(srcdir)/utils/%.c,$(OBJECTS)) >.depend ++ gcc -MM $(CFLAGS) $(patsubst %.o,$(srcdir)/utils/%.c,$(OBJECTS)) >.depend + + # + # include a dependency file if one exists diff --git a/media-libs/svgalib/svgalib-1.9.18-r1.ebuild b/media-libs/svgalib/svgalib-1.9.18-r1.ebuild index 2571580d69cb..815364e3e8a9 100644 --- a/media-libs/svgalib/svgalib-1.9.18-r1.ebuild +++ b/media-libs/svgalib/svgalib-1.9.18-r1.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-libs/svgalib/svgalib-1.9.18-r1.ebuild,v 1.6 2004/06/18 15:33:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.18-r1.ebuild,v 1.7 2004/06/19 07:12:30 vapier Exp $ inherit eutils flag-o-matic @@ -38,6 +38,12 @@ src_unpack() { # Get it to work with kernel 2.6 epatch ${FILESDIR}/${P}-linux2.6-v2.patch + # Fix include bug #54198 + epatch ${FILESDIR}/${P}-utils-include.patch + + # Have lrmi compile with our $CFLAGS + epatch ${FILESDIR}/${P}-lrmi-gentoo-cflags.patch + # Disable kernel module support while building stages #38403 #use build && sed -i 's:installmodule ::' Makefile |