diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-11-29 00:35:12 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2014-11-29 00:35:12 +0000 |
| commit | 3542112532e77474829b34fbf16135cfda1b5d3b (patch) | |
| tree | 72502f842f92a52c9f748e50e815e983d284c5cf /games/evq3 | |
| parent | fc1a18fd6693722cc821c69e47808db5445ed1a4 (diff) | |
| download | ports-3542112532e77474829b34fbf16135cfda1b5d3b.tar.gz ports-3542112532e77474829b34fbf16135cfda1b5d3b.zip | |
- Fix build on i386 (2 separate problems)
- Drop @dirrm* from plist
MFH: 2014Q4
Notes
Notes:
svn path=/head/; revision=373589
Diffstat (limited to 'games/evq3')
| -rw-r--r-- | games/evq3/files/patch-Makefile | 8 | ||||
| -rw-r--r-- | games/evq3/files/patch-code__qcommon__vm_x86.c | 11 | ||||
| -rw-r--r-- | games/evq3/pkg-plist | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/games/evq3/files/patch-Makefile b/games/evq3/files/patch-Makefile index 7eeb7f9bc508..62f9cde7bc06 100644 --- a/games/evq3/files/patch-Makefile +++ b/games/evq3/files/patch-Makefile @@ -1,5 +1,5 @@ ---- ./Makefile.orig 2008-06-11 23:35:55.000000000 -0300 -+++ ./Makefile 2008-06-27 20:31:07.000000000 -0300 +--- Makefile.orig 2014-11-28 23:19:34.000000000 +0300 ++++ Makefile 2014-11-28 23:21:07.000000000 +0300 @@ -23,29 +23,6 @@ endif endif @@ -106,10 +106,10 @@ - else #default to i386 - ARCH=i386 - endif #alpha test -- + BASE_CFLAGS = -DARCH='\"$(ARCH)\"' -I$(LOCALBASE)/include -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ + -DLIBDIR='\"$(LIBDIR)\"' -DUSE_ICON $(shell sdl-config --cflags) +- - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ - -DUSE_ICON $(shell sdl-config --cflags) + DEBUG_CFLAGS=$(BASE_CFLAGS) -g @@ -139,7 +139,7 @@ + RELEASE_CFLAGS+=-O3 -ffast-math -funroll-loops -fomit-frame-pointer \ + -fexpensive-optimizations + ifeq ($(ARCH),i386) -+ RELEASE_CFLAGS+=-falign-loops=2 -falign-jumps=2 -falign-functions=2 \ ++ RELEASE_CFLAGS+=-falign-functions=2 \ + -fstrength-reduce + endif endif diff --git a/games/evq3/files/patch-code__qcommon__vm_x86.c b/games/evq3/files/patch-code__qcommon__vm_x86.c new file mode 100644 index 000000000000..7dd9d2bc5a54 --- /dev/null +++ b/games/evq3/files/patch-code__qcommon__vm_x86.c @@ -0,0 +1,11 @@ +--- code/qcommon/vm_x86.c.orig 2014-11-28 23:31:38.000000000 +0300 ++++ code/qcommon/vm_x86.c 2014-11-28 23:32:14.000000000 +0300 +@@ -93,7 +93,7 @@ + #endif + + +-static int callMask = 0; ++int callMask = 0; + + static int instruction, pass; + static int lastConst = 0; diff --git a/games/evq3/pkg-plist b/games/evq3/pkg-plist index 9b1c72560d07..f49bb29659d8 100644 --- a/games/evq3/pkg-plist +++ b/games/evq3/pkg-plist @@ -10,7 +10,3 @@ %%GAMELIBS%%%%LIBDIR%%/missionpack/qagame.so %%GAMELIBS%%%%LIBDIR%%/missionpack/ui.so %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%@dirrm %%DOCSDIR%% -%%GAMELIBS%%@dirrm %%LIBDIR%%/missionpack -@dirrm %%LIBDIR%%/baseq3 -@dirrm %%LIBDIR%% |