* [gentoo-commits] gentoo-x86 commit in games-roguelike/powder/files: powder-113-make.patch
@ 2010-05-03 23:56 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-05-03 23:56 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 10/05/03 23:56:21
Added: powder-113-make.patch
Log:
initial commit - ebuild and patch submitted by Sergey Zasenko via bug #256768 with additional help from Anton Romanov
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.1 games-roguelike/powder/files/powder-113-make.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-roguelike/powder/files/powder-113-make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-roguelike/powder/files/powder-113-make.patch?rev=1.1&content-type=text/plain
Index: powder-113-make.patch
===================================================================
--- powder110_src/make/makerules.origin 2009-01-29 00:32:32.141421840 +0200
+++ powder110_src/make/makerules 2009-01-29 00:27:37.128428046 +0200
@@ -1,11 +1,11 @@
.cpp.o:
- g++ -O3 -I . -DLINUX -c $< -o $@ $(CXXFLAGS)
+ $(CXX) -I . -DLINUX -c $< -o $@ $(CXXFLAGS)
all: $(TARGET)
$(TARGET): $(OFILES)
- g++ -O3 -o $(TARGET) $(OFILES) $(CXXFLAGS)
+ $(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS)
clean:
- rm -f *.o
- rm -f $(TARGET)
+ $(RM) *.o
+ $(RM) $(TARGET)
--- powder110_src/make/makerules.LINUX.origin 2009-01-28 21:59:57.499759608 +0200
+++ powder110_src/make/makerules.LINUX 2009-01-29 00:27:34.747275321 +0200
@@ -1,5 +1,5 @@
.cpp.o:
- g++ -O3 -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS)
+ $(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS)
all: $(TARGET)
@@ -8,10 +8,10 @@
# http://www.trilithium.com/johan/2005/06/static-libstdc/
# and is to try and ensure we end up with a static link
# of stdc++.
- rm -f libstdc++.a
+ $(RM) libstdc++.a
ln -s `g++ -print-file-name=libstdc++.a`
- g++ -O3 -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
+ $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
clean:
- rm -f *.o
- rm -f $(TARGET)
+ $(RM) *.o
+ $(RM) $(TARGET)
--- powder110_src/port/linux/Makefile.orig 2008-01-14 04:28:15.000000000 +0200
+++ powder110_src/port/linux/Makefile 2009-01-29 02:19:52.018078431 +0200
@@ -38,19 +38,54 @@
../../gfx/all_bitmaps.o \
../../rooms/allrooms.o
-include ../../make/makerules.LINUX
+PREMAKE_TRG = ../../support/map2c/map2c \
+ ../../support/tile2c/tile2c \
+ ../../support/bmp2c/bmp2c \
+ ../../support/encyclopedia2c/encyclopedia2c \
+ ../../support/enummaker/enummaker\
+ ../../support/txt2c/txt2c
-clean:
- cd ../.. ; rm -f *.o
- cd ../../gfx ; rm -f *.o
- rm -f *.o
- cd ../sdl ; rm -f *.o
- rm -f $(TARGET)
+all: $(TARGET)
+
+
+$(PREMAKE_TRG):
+ $(MAKE) -C `dirname $@`
-premake:
+premake: $(PREMAKE_TRG)
cd ../../rooms ; ./buildrooms.bash
cd ../../gfx ; ./rebuild.sh
cd ../.. ; support/enummaker/enummaker source.txt
cd ../.. ; support/txt2c/txt2c LICENSE.TXT license.cpp
cd ../.. ; support/txt2c/txt2c CREDITS.TXT credits.cpp
cd ../.. ; support/encyclopedia2c/encyclopedia2c encyclopedia.txt
+
+$(OFILES): premake
+ $(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $(patsubst %.o,%.cpp,$@) -o $@ $(CXXFLAGS)
+
+$(TARGET): $(OFILES)
+ $(CXX) -o $@ $(OFILES) `sdl-config --libs` $(CXXFLAGS)
+
+$(TARGET)-static: $(OFILES)
+ # This extra step is from:
+ # http://www.trilithium.com/johan/2005/06/static-libstdc/
+ # and is to try and ensure we end up with a static link
+ # of stdc++.
+ $(RM) libstdc++.a
+ ln -s `g++ -print-file-name=libstdc++.a`
+ $(CXX) -static-libgcc -L. -o $@ $(OFILES) `sdl-config --libs` $(CXXFLAGS)
+
+clean:
+ $(RM) *.o $(TARGET) libstdc++.a
+ cd ../../; $(RM) credits.cpp encyclopedia.cpp encyclopedia.h glbdef.cpp glbdef.h license.cpp
+ cd ../../gfx; $(RM)
+ cd ../../gfx; $(RM) icon_sdl.bmp.c slug_and_blood.bmp.c slug_and_blood_hires.bmp.c classic/*.c adambolt/*.c nethack/*.c ascii/*.c akoimeexx/*.c
+ cd ../../rooms/; $(RM) *.cpp allrooms.h allrooms.o
+ $(RM)
+ $(RM) ../../*.o
+ $(RM) ../../gfx/*.o
+ $(RM) ../sdl/*.o
+ @for trgt in $$( echo "$(PREMAKE_TRG)" | tr -s ' ' '\n' ); do \
+ $(MAKE) clean -C `dirname $$trgt` ; \
+ done;
+
+.PHONY: all clean premake
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-roguelike/powder/files: powder-113-make.patch
@ 2010-05-04 0:57 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-05-04 0:57 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 10/05/04 00:57:02
Modified: powder-113-make.patch
Log:
reroll and actually apply patch
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.2 games-roguelike/powder/files/powder-113-make.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-roguelike/powder/files/powder-113-make.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-roguelike/powder/files/powder-113-make.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-roguelike/powder/files/powder-113-make.patch?r1=1.1&r2=1.2
Index: powder-113-make.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-roguelike/powder/files/powder-113-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- powder-113-make.patch 3 May 2010 23:56:21 -0000 1.1
+++ powder-113-make.patch 4 May 2010 00:57:02 -0000 1.2
@@ -1,107 +1,47 @@
---- powder110_src/make/makerules.origin 2009-01-29 00:32:32.141421840 +0200
-+++ powder110_src/make/makerules 2009-01-29 00:27:37.128428046 +0200
-@@ -1,11 +1,11 @@
- .cpp.o:
-- g++ -O3 -I . -DLINUX -c $< -o $@ $(CXXFLAGS)
-+ $(CXX) -I . -DLINUX -c $< -o $@ $(CXXFLAGS)
-
+diff -ru powder113_src.orig/make/makerules powder113_src/make/makerules
+--- powder113_src.orig/make/makerules 2009-02-05 20:11:41.000000000 -0500
++++ powder113_src/make/makerules 2010-05-03 20:38:32.579540189 -0400
+@@ -8,7 +8,7 @@
all: $(TARGET)
$(TARGET): $(OFILES)
-- g++ -O3 -o $(TARGET) $(OFILES) $(CXXFLAGS)
-+ $(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS)
+- $(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS)
++ $(CXX) -o $(TARGET) $(OFILES) $(CXXFLAGS) $(LDFLAGS)
clean:
-- rm -f *.o
-- rm -f $(TARGET)
-+ $(RM) *.o
-+ $(RM) $(TARGET)
---- powder110_src/make/makerules.LINUX.origin 2009-01-28 21:59:57.499759608 +0200
-+++ powder110_src/make/makerules.LINUX 2009-01-29 00:27:34.747275321 +0200
-@@ -1,5 +1,5 @@
- .cpp.o:
-- g++ -O3 -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS)
-+ $(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS)
+ $(RM) $(OFILES)
+diff -ru powder113_src.orig/make/makerules.LINUX powder113_src/make/makerules.LINUX
+--- powder113_src.orig/make/makerules.LINUX 2009-01-18 19:54:09.000000000 -0500
++++ powder113_src/make/makerules.LINUX 2010-05-03 20:39:11.022462202 -0400
+@@ -13,8 +13,8 @@
+ # and is to try and ensure we end up with a static link
+ # of stdc++.
+ $(RM) libstdc++.a
+- ln -s `g++ -print-file-name=libstdc++.a`
+- $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
++ ln -s `$(CXX) -print-file-name=libstdc++.a`
++ $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) $(LDFLAGS)
+ clean:
+ $(RM) $(OFILES)
+diff -ru powder113_src.orig/port/linux/Makefile powder113_src/port/linux/Makefile
+--- powder113_src.orig/port/linux/Makefile 2009-05-13 19:32:42.000000000 -0400
++++ powder113_src/port/linux/Makefile 2010-05-03 20:40:57.629463531 -0400
+@@ -48,7 +48,7 @@
all: $(TARGET)
-@@ -8,10 +8,10 @@
- # http://www.trilithium.com/johan/2005/06/static-libstdc/
- # and is to try and ensure we end up with a static link
+ powder: premake $(OFILES)
+- $(CXX) -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
++ $(CXX) -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) $(LDFLAGS)
+
+ .cpp.o:
+ $(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $< -o $@ $(CXXFLAGS)
+@@ -60,7 +60,7 @@
# of stdc++.
-- rm -f libstdc++.a
-+ $(RM) libstdc++.a
+ $(RM) libstdc++.a
ln -s `g++ -print-file-name=libstdc++.a`
-- g++ -O3 -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
-+ $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
+- $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS)
++ $(CXX) -static-libgcc -L. -o $(TARGET) $(OFILES) `sdl-config --libs` $(CXXFLAGS) $(LDFLAGS)
clean:
-- rm -f *.o
-- rm -f $(TARGET)
-+ $(RM) *.o
-+ $(RM) $(TARGET)
---- powder110_src/port/linux/Makefile.orig 2008-01-14 04:28:15.000000000 +0200
-+++ powder110_src/port/linux/Makefile 2009-01-29 02:19:52.018078431 +0200
-@@ -38,19 +38,54 @@
- ../../gfx/all_bitmaps.o \
- ../../rooms/allrooms.o
-
--include ../../make/makerules.LINUX
-+PREMAKE_TRG = ../../support/map2c/map2c \
-+ ../../support/tile2c/tile2c \
-+ ../../support/bmp2c/bmp2c \
-+ ../../support/encyclopedia2c/encyclopedia2c \
-+ ../../support/enummaker/enummaker\
-+ ../../support/txt2c/txt2c
-
--clean:
-- cd ../.. ; rm -f *.o
-- cd ../../gfx ; rm -f *.o
-- rm -f *.o
-- cd ../sdl ; rm -f *.o
-- rm -f $(TARGET)
-+all: $(TARGET)
-+
-+
-+$(PREMAKE_TRG):
-+ $(MAKE) -C `dirname $@`
-
--premake:
-+premake: $(PREMAKE_TRG)
- cd ../../rooms ; ./buildrooms.bash
- cd ../../gfx ; ./rebuild.sh
- cd ../.. ; support/enummaker/enummaker source.txt
- cd ../.. ; support/txt2c/txt2c LICENSE.TXT license.cpp
- cd ../.. ; support/txt2c/txt2c CREDITS.TXT credits.cpp
- cd ../.. ; support/encyclopedia2c/encyclopedia2c encyclopedia.txt
-+
-+$(OFILES): premake
-+ $(CXX) -DLINUX -I ../../port/sdl `sdl-config --cflags` -c $(patsubst %.o,%.cpp,$@) -o $@ $(CXXFLAGS)
-+
-+$(TARGET): $(OFILES)
-+ $(CXX) -o $@ $(OFILES) `sdl-config --libs` $(CXXFLAGS)
-+
-+$(TARGET)-static: $(OFILES)
-+ # This extra step is from:
-+ # http://www.trilithium.com/johan/2005/06/static-libstdc/
-+ # and is to try and ensure we end up with a static link
-+ # of stdc++.
-+ $(RM) libstdc++.a
-+ ln -s `g++ -print-file-name=libstdc++.a`
-+ $(CXX) -static-libgcc -L. -o $@ $(OFILES) `sdl-config --libs` $(CXXFLAGS)
-+
-+clean:
-+ $(RM) *.o $(TARGET) libstdc++.a
-+ cd ../../; $(RM) credits.cpp encyclopedia.cpp encyclopedia.h glbdef.cpp glbdef.h license.cpp
-+ cd ../../gfx; $(RM)
-+ cd ../../gfx; $(RM) icon_sdl.bmp.c slug_and_blood.bmp.c slug_and_blood_hires.bmp.c classic/*.c adambolt/*.c nethack/*.c ascii/*.c akoimeexx/*.c
-+ cd ../../rooms/; $(RM) *.cpp allrooms.h allrooms.o
-+ $(RM)
-+ $(RM) ../../*.o
-+ $(RM) ../../gfx/*.o
-+ $(RM) ../sdl/*.o
-+ @for trgt in $$( echo "$(PREMAKE_TRG)" | tr -s ' ' '\n' ); do \
-+ $(MAKE) clean -C `dirname $$trgt` ; \
-+ done;
-+
-+.PHONY: all clean premake
+ $(RM) $(OFILES)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in games-roguelike/powder/files: powder-113-make.patch
@ 2010-06-07 22:40 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2010-06-07 22:40 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 10/06/07 22:40:04
Removed: powder-113-make.patch
Log:
old
(Portage version: 2.1.8.3/cvs/Linux i686)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-06-07 22:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-07 22:40 [gentoo-commits] gentoo-x86 commit in games-roguelike/powder/files: powder-113-make.patch Michael Sterrett (mr_bones_)
-- strict thread matches above, loose matches on Subject: below --
2010-05-04 0:57 Michael Sterrett (mr_bones_)
2010-05-03 23:56 Michael Sterrett (mr_bones_)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox