diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-10-01 20:54:53 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-10-01 20:54:53 +0100 |
| commit | 391b5b359a346aff490103da7dddc85047f83830 (patch) | |
| tree | 29eea460a0bd7e1ff21d43b9d6df9af4d8a175e1 /games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch | |
| parent | c719fdcee603a5a706a45d10cb598762d56a727d (diff) | |
gentoo resync : 01.10.2021
Diffstat (limited to 'games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch')
| -rw-r--r-- | games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch new file mode 100644 index 000000000000..670f18889cab --- /dev/null +++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-makefile.patch @@ -0,0 +1,62 @@ +Set non-/games paths, respect FLAGS, add LIBS to pass them in right order, +use pkg-config, don't strip, and show commands/errors directly. + +https://bugs.gentoo.org/125550 +https://bugs.gentoo.org/126835 +https://bugs.gentoo.org/234013 +--- a/Makefile ++++ b/Makefile +@@ -15,4 +15,4 @@ + PREFIX=/usr/local +-DATADIR=$(PREFIX)/share/games/flobopuyo +-INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/games ++DATADIR=$(PREFIX)/share/flobopuyo ++INSTALL_BINDIR=$(DESTDIR)/$(PREFIX)/bin + INSTALL_DATADIR=$(DESTDIR)/$(DATADIR) +@@ -44,10 +44,10 @@ + CC=g++ +-CXX=g++ + +-CFLAGS= -DDATADIR=\"${DATADIR}\" +-LDFLAGS= ++CFLAGS:=$(CXXFLAGS) $(CPPFLAGS) -DDATADIR=\"$(DATADIR)\" + + ifneq ($(PLATFORM), $(CYGWIN_VERSION)) +-CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include +-LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs` ++OPENGL-false= ++OPENGL-$(ENABLE_OPENGL)=opengl ++CFLAGS:=$(CFLAGS) $(shell $(PKG_CONFIG) --cflags $(OPENGL-true) sdl SDL_image SDL_mixer) ++LIBS:=$(LIBS) $(shell $(PKG_CONFIG) --libs $(OPENGL-true) sdl SDL_image SDL_mixer) + endif +@@ -92,3 +92,2 @@ + ifeq ($(PLATFORM), Linux) +-LDFLAGS:=$(LDFLAGS) -lGL + endif +@@ -112,3 +111,3 @@ + flobopuyo: ${OBJFILES} +- @echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES} ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o flobopuyo $(OBJFILES) $(LIBS) + @echo "--------------------------------------" +@@ -127,6 +126,6 @@ + %.o:%.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false) ++ $(CXX) $(CXXFLAGS) -c $< + + %.o:%.cpp +- @echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false) ++ $(CXX) $(CXXFLAGS) -c $< + +@@ -157,6 +156,6 @@ + glSDL.o:glSDL.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS ++ $(CXX) $(CXXFLAGS) -c $< + @rm -f EXT_WARNINGS + SDL_prim.o:SDL_prim.c +- @echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS ++ $(CXX) $(CXXFLAGS) -c $< + @rm -f EXT_WARNINGS +@@ -180,3 +179,2 @@ + install: flobopuyo +- strip flobopuyo + mkdir -p ${INSTALL_BINDIR} |