Archives
Archives
| From: | "Kacper Kowalik (xarthisius)" <xarthisius@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in media-gfx/mandelbulber/files: mandelbulber-1.00-qa.patch mandelbulber-1.00-gcc46.patch mandelbulber-0.97-qa.patch |
| Date: | Wed, 27 Apr 2011 20:19:21 |
| Message-Id: | 20110427201909.82DAF20057@flycatcher.gentoo.org |
| 1 | xarthisius 11/04/27 20:19:09 |
| 2 | |
| 3 | Added: mandelbulber-1.00-qa.patch |
| 4 | mandelbulber-1.00-gcc46.patch |
| 5 | Removed: mandelbulber-0.97-qa.patch |
| 6 | Log: |
| 7 | Version bump wrt #365063 by Ondrej Filip <chytzkoi@××××××.cz>. Fixes building with gcc 4.6. Drop old. |
| 8 | |
| 9 | (Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
| 10 | |
| 11 | Revision Changes Path |
| 12 | 1.1 media-gfx/mandelbulber/files/mandelbulber-1.00-qa.patch |
| 13 | |
| 14 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/mandelbulber/files/mandelbulber-1.00-qa.patch?rev=1.1&view=markup |
| 15 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/mandelbulber/files/mandelbulber-1.00-qa.patch?rev=1.1&content-type=text/plain |
| 16 | |
| 17 | Index: mandelbulber-1.00-qa.patch |
| 18 | =================================================================== |
| 19 | Respect CXX,CXXFLAGS, fix as-needed |
| 20 | |
| 21 | Patch written by Kacper Kowalik <xarthisius@g.o> |
| 22 | |
| 23 | --- a/makefiles/makefile |
| 24 | +++ b/makefiles/makefile |
| 25 | @@ -44,7 +44,7 @@ |
| 26 | mandelbulber: $(OBJS) $(USER_OBJS) |
| 27 | @echo 'Building target: $@' |
| 28 | @echo 'Invoking: GCC C++ Linker' |
| 29 | - g++ `pkg-config --libs gtk+-2.0 gthread-2.0` -o"mandelbulber" $(OBJS) $(USER_OBJS) $(LIBS) |
| 30 | + $(CXX) $(CXXFLAGS) $(LDFLAGS) -o "mandelbulber" $(OBJS) $(USER_OBJS) `pkg-config --libs gtk+-2.0 gthread-2.0` $(LIBS) |
| 31 | @echo 'Finished building target: $@' |
| 32 | @echo ' ' |
| 33 | |
| 34 | --- a/makefiles/src/subdir.mk |
| 35 | +++ b/makefiles/src/subdir.mk |
| 36 | @@ -65,7 +65,7 @@ |
| 37 | src/%.o: ../src/%.cpp |
| 38 | @echo 'Building file: $<' |
| 39 | @echo 'Invoking: GCC C++ Compiler' |
| 40 | - g++ -O2 -ffast-math -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" |
| 41 | + $(CXX) $(CXXFLAGS) -Wall -c -fmessage-length=0 `pkg-config --cflags gtk+-2.0 gthread-2.0;` -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" |
| 42 | @echo 'Finished building: $<' |
| 43 | @echo ' ' |
| 44 | |
| 45 | |
| 46 | |
| 47 | |
| 48 | 1.1 media-gfx/mandelbulber/files/mandelbulber-1.00-gcc46.patch |
| 49 | |
| 50 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/mandelbulber/files/mandelbulber-1.00-gcc46.patch?rev=1.1&view=markup |
| 51 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/mandelbulber/files/mandelbulber-1.00-gcc46.patch?rev=1.1&content-type=text/plain |
| 52 | |
| 53 | Index: mandelbulber-1.00-gcc46.patch |
| 54 | =================================================================== |
| 55 | Fix building with GCC 4.6 |
| 56 | |
| 57 | --- src/fractal.h |
| 58 | +++ src/fractal.h |
| 59 | @@ -9,6 +9,7 @@ |
| 60 | #define FRACTAL_H_ |
| 61 | |
| 62 | #include <vector> |
| 63 | +#include <cstddef> |
| 64 | #include "common_math.h" |
| 65 | #include "fractparams.h" |