diff options
| author |   Kacper Kowalik <xarthisius@gentoo.org> | 2010-09-11 14:55:15 +0000 |
|---|---|---|
| committer | Kacper Kowalik <xarthisius@gentoo.org> | 2010-09-11 14:55:15 +0000 |
| commit | 93273477b8bdbb820165ab705f8bf35b22db6483 (patch) | |
| tree | e47c2dfc1016c3be0bf1155561eb0970ae0c4ea4 /x11-misc/fireflies/files | |
| parent | eapi bump, use EAPI2 features instead of built_with_use checks (diff) | |
| download | gentoo-2-93273477b8bdbb820165ab705f8bf35b22db6483.tar.gz gentoo-2-93273477b8bdbb820165ab705f8bf35b22db6483.tar.bz2 gentoo-2-93273477b8bdbb820165ab705f8bf35b22db6483.zip | |
Respect CXXFLAGS, LDFLAGS wrt bug 336814. Thanks to Diego for the report. Fix parallel build, configure recursively.
(Portage version: 2.1.9/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/fireflies/files')
| -rw-r--r-- | x11-misc/fireflies/files/fireflies-2.07-build_system.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/x11-misc/fireflies/files/fireflies-2.07-build_system.patch b/x11-misc/fireflies/files/fireflies-2.07-build_system.patch new file mode 100644 index 000000000000..2097b881b743 --- /dev/null +++ b/x11-misc/fireflies/files/fireflies-2.07-build_system.patch @@ -0,0 +1,85 @@ +Multiple QA issues: +* Respect CXXFLAGS,LDFLAGS +* fix parallel build +* configure recursively +* don't strip binaries +* don't unpack libgfx during make + +http://bugs.gentoo.org/show_bug.cgi?id=336814 + +--- configure.ac ++++ configure.ac +@@ -2,6 +2,7 @@ + AC_INIT(fireflies, 2.07, guy@somewhere.fscked.org) + AC_CONFIG_SRCDIR([src/arrow.cc]) + AC_CONFIG_HEADER([config.h]) ++AC_CONFIG_SUBDIRS([libgfx]) + + sys=`uname` + +--- Makefile ++++ Makefile +@@ -21,18 +21,17 @@ + win32/ + + all: libgfx/src/libgfx.a +- cd src && make ++ $(MAKE) -C src + + libgfx/src/libgfx.a: +- gunzip -c libgfx-1.0.1.tar.gz | tar x +- cd libgfx && ./configure && cd src && make ++ $(MAKE) -C libgfx/src + + install: all + sh ./installit $(DESTDIR) + + clean: +- make -C src clean +- make -C win32 clean ++ $(MAKE) -C src clean ++ $(MAKE) -C win32 clean + + dist: + rm -rf fireflies-$(VERSION) +@@ -42,7 +41,7 @@ + + # need Make.include temporarily to run make + cp Make.include fireflies-$(VERSION) +- make -C fireflies-$(VERSION) clean ++ $(MAKE) -C fireflies-$(VERSION) clean + rm -f fireflies-$(VERSION)/Make.include + + # don't want to include debian's buildroot +--- src/Makefile ++++ src/Makefile +@@ -8,8 +8,7 @@ + all: $(PROGRAM) + + $(PROGRAM): $(OBJECTS) +- $(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS) +- strip $(PROGRAM) ++ $(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LIBS) + + $(OBJECTS): $(HEADERS) + +@@ -17,7 +16,7 @@ + .SUFFIXES: .cc .rc .o + + .cc.o: +- $(CXX) -c $(CFLAGS) -o $@ $< ++ $(CXX) -c $(CXXFLAGS) -o $@ $< + + #$(HEADERS_GCH): %.h.gch: %.h + # $(CXX) -c -x c++-header $(CFLAGS) -o $@ $< +--- Make.include.in ++++ Make.include.in +@@ -5,7 +5,7 @@ + GL_LIBS = @GL_LIBS@ + OPT_LIBS = @OPT_LIBS@ + +-CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@ ++CXXFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CXXFLAGS@ + LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@ + + OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@ |