* [gentoo-commits] repo/proj/guru:dev commit in: games-strategy/gigalomania/files/
@ 2024-07-16 7:48 Vitaly Zdanevich
0 siblings, 0 replies; 3+ messages in thread
From: Vitaly Zdanevich @ 2024-07-16 7:48 UTC (permalink / raw
To: gentoo-commits
commit: bf643d2fe683d020907c17d1364a2b06343a8a3b
Author: Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
AuthorDate: Tue Jul 16 07:48:30 2024 +0000
Commit: Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
CommitDate: Tue Jul 16 07:48:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf643d2f
Makefile: add ${LDFLAGS}
Closes: https://bugs.gentoo.org/933591
Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly <AT> ya.ru>
games-strategy/gigalomania/files/Makefile.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/games-strategy/gigalomania/files/Makefile.patch b/games-strategy/gigalomania/files/Makefile.patch
index da39a06c6..ed0a42f75 100644
--- a/games-strategy/gigalomania/files/Makefile.patch
+++ b/games-strategy/gigalomania/files/Makefile.patch
@@ -1,5 +1,5 @@
diff --git i/Makefile w/Makefile
-index 7d3056a..a15ef37 100644
+index 7d3056a..d8b1670 100644
--- i/Makefile
+++ w/Makefile
@@ -1,28 +1,27 @@
@@ -18,11 +18,11 @@ index 7d3056a..a15ef37 100644
$(APP): $(OFILES) $(HFILES) $(CFILES)
- $(CC) $(OFILES) $(CCFLAGS) $(LINKPATH) $(LIBS) -o $(APP)
-+ $(CC) $(OFILES) ${CXXFLAGS} $(LINKPATH) $(LIBS) -o $(APP)
++ $(CC) $(OFILES) ${CXXFLAGS} ${LDFLAGS} $(LINKPATH) $(LIBS) -o $(APP)
.cpp.o:
- $(CC) $(CCFLAGS) -O2 $(INC) -c $< -o $@
-+ $(CC) ${CXXFLAGS} $(INC) -c $< -o $@
++ $(CC) ${CXXFLAGS} ${LDFLAGS} $(INC) -c $< -o $@
# REMEMBER to update debian/dirs if the system directories that we use are changed!!!
install: $(APP)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-strategy/gigalomania/files/
@ 2024-07-16 8:53 Vitaly Zdanevich
0 siblings, 0 replies; 3+ messages in thread
From: Vitaly Zdanevich @ 2024-07-16 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 045133af3013ed23260908c32e5ca3bcd1b4297e
Author: Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
AuthorDate: Tue Jul 16 08:53:12 2024 +0000
Commit: Vitaly Zdanevich <zdanevich.vitaly <AT> ya <DOT> ru>
CommitDate: Tue Jul 16 08:53:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=045133af
games-strategy/gigalomania: fix error calls g++ directly
Closes: https://bugs.gentoo.org/933590
Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly <AT> ya.ru>
games-strategy/gigalomania/files/Makefile.patch | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/games-strategy/gigalomania/files/Makefile.patch b/games-strategy/gigalomania/files/Makefile.patch
index ed0a42f75..36c84c21b 100644
--- a/games-strategy/gigalomania/files/Makefile.patch
+++ b/games-strategy/gigalomania/files/Makefile.patch
@@ -1,9 +1,9 @@
diff --git i/Makefile w/Makefile
-index 7d3056a..d8b1670 100644
+index 7d3056a..54fbb73 100644
--- i/Makefile
+++ w/Makefile
-@@ -1,28 +1,27 @@
- CC=g++
+@@ -1,28 +1,26 @@
+-CC=g++
-CCFLAGS=-O2 -Wall
CFILES=game.cpp gamestate.cpp gui.cpp image.cpp main.cpp panel.cpp player.cpp resources.cpp screen.cpp sector.cpp sound.cpp tutorial.cpp utils.cpp TinyXML/tinyxml.cpp TinyXML/tinyxmlerror.cpp TinyXML/tinyxmlparser.cpp
HFILES=game.h gamestate.h gui.h image.h panel.h player.h resources.h screen.h sector.h sound.h tutorial.h utils.h common.h stdafx.h TinyXML/tinyxml.h
@@ -18,11 +18,11 @@ index 7d3056a..d8b1670 100644
$(APP): $(OFILES) $(HFILES) $(CFILES)
- $(CC) $(OFILES) $(CCFLAGS) $(LINKPATH) $(LIBS) -o $(APP)
-+ $(CC) $(OFILES) ${CXXFLAGS} ${LDFLAGS} $(LINKPATH) $(LIBS) -o $(APP)
++ $(CXX) $(OFILES) ${CXXFLAGS} ${LDFLAGS} $(LINKPATH) $(LIBS) -o $(APP)
.cpp.o:
- $(CC) $(CCFLAGS) -O2 $(INC) -c $< -o $@
-+ $(CC) ${CXXFLAGS} ${LDFLAGS} $(INC) -c $< -o $@
++ $(CXX) ${CXXFLAGS} ${LDFLAGS} $(INC) -c $< -o $@
# REMEMBER to update debian/dirs if the system directories that we use are changed!!!
install: $(APP)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-strategy/gigalomania/files/
@ 2024-07-17 1:13 Lucio Sauer
0 siblings, 0 replies; 3+ messages in thread
From: Lucio Sauer @ 2024-07-17 1:13 UTC (permalink / raw
To: gentoo-commits
commit: 9552e2773188ad9e1d59b9eb8bb12399a76b1ef9
Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Tue Jul 16 23:12:50 2024 +0000
Commit: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
CommitDate: Wed Jul 17 01:13:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9552e277
games-strategy/gigalomania: add description to Makefile patch
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
games-strategy/gigalomania/files/Makefile.patch | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/games-strategy/gigalomania/files/Makefile.patch b/games-strategy/gigalomania/files/Makefile.patch
index 36c84c21b..6a1b161ee 100644
--- a/games-strategy/gigalomania/files/Makefile.patch
+++ b/games-strategy/gigalomania/files/Makefile.patch
@@ -1,5 +1,8 @@
-diff --git i/Makefile w/Makefile
-index 7d3056a..54fbb73 100644
+Use correct CXX, CXXFLAGS, LDFLAGS
+
+Bug: https://bugs.gentoo.org/933592
+Bug: https://bugs.gentoo.org/933591
+Bug: https://bugs.gentoo.org/933590
--- i/Makefile
+++ w/Makefile
@@ -1,28 +1,26 @@
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-17 1:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-16 7:48 [gentoo-commits] repo/proj/guru:dev commit in: games-strategy/gigalomania/files/ Vitaly Zdanevich
-- strict thread matches above, loose matches on Subject: below --
2024-07-16 8:53 Vitaly Zdanevich
2024-07-17 1:13 Lucio Sauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox