diff options
| author |   Alexey Sokolov <sokolov@google.com> | 2020-12-15 16:38:22 +0100 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2020-12-15 16:38:22 +0100 |
| commit | d7620f5ae1999b7b0db6138def8beb34a32c77df (patch) | |
| tree | 852379a626bbee2ab666806525a4d0029e68c19c /games-roguelike/tomenet/files | |
| parent | games-action/formido: drop 1.0.1-r1 (diff) | |
| download | gentoo-d7620f5ae1999b7b0db6138def8beb34a32c77df.tar.gz gentoo-d7620f5ae1999b7b0db6138def8beb34a32c77df.tar.bz2 gentoo-d7620f5ae1999b7b0db6138def8beb34a32c77df.zip | |
games-roguelike/tomenet: version bump, 4.7.3
Closes: https://bugs.gentoo.org/739336
Closes: https://bugs.gentoo.org/722622
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'games-roguelike/tomenet/files')
| -rw-r--r-- | games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch new file mode 100644 index 000000000000..c00fc5f1e699 --- /dev/null +++ b/games-roguelike/tomenet/files/tomenet-4.7.3-makefile.patch @@ -0,0 +1,43 @@ +diff --git a/makefile b/makefile +index ee56a33..7f3c81f 100644 +--- a/makefile ++++ b/makefile +@@ -224,7 +224,7 @@ CPP = cpp + #thing is, that the correctly transcribed URL will actually make tolua choke. + #So, -nostdinc will prevent the whole own comment blob of cpp to get generated + #in the first place, as we never asked for it: +-CPPFLAGS = -C -P -nostdinc ++CPPFLAGS = -C -P -nostdinc $(GENTOO_CPPFLAGS) + + # gcc variant: + #CPP = gcc +--- a/makefile ++++ b/makefile +@@ -234,5 +234,19 @@ CC = gcc + X11BASE = /usr/X11R6 + ++# defines ++ifdef USE_SDL ++CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags) ++SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer ++endif ++ ++ifdef USE_X ++CFLAGS += -DUSE_X11 ++LIBS += -lX11 ++endif ++ ++CFLAGS += -Wall ++CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 ++LIBS += $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS} + + ## + ## Standard version -- supports X11 (main-x11.c) +@@ -259,7 +274,5 @@ X11BASE = /usr/X11R6 + #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIE +-CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIE -Wno-format-truncation + #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer +-LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer + ACCEDIT_LIBS = -lcurses -lcrypt + ## + ## Without SDL |