cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r556111

Browse Source 
games/openarena: fix build on powerpc64

Fix powerpc64 detection on FreeBSD.

Approved by:	portmgr (fix build blanket)
This commit is contained in:
Piotr Kubaj 2020-11-23 15:17:26 +00:00
parent 8593605964
commit de29d37158
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=556112
2 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
games/openarena/files/patch-Makefile
View File

@ -1,6 +1,17 @@
--- Makefile.orig 2011-12-12 22:48:49 UTC
+++ Makefile
@@ -205,6 +205,8 @@ ifneq ($(BUILD_CLIENT),0)
@@ -16,6 +16,10 @@ ifeq ($(COMPILE_PLATFORM),darwin)
# Apple does some things a little differently...
COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
endif
+ifeq ($(COMPILE_PLATFORM),freebsd)
+ # FreeBSD does some things a little differently...
+ COMPILE_ARCH=$(shell uname -p)
+endif
ifeq ($(COMPILE_PLATFORM),mingw32)
ifeq ($(COMPILE_ARCH),i386)
@@ -205,6 +209,8 @@ ifneq ($(BUILD_CLIENT),0)
OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
@ -9,7 +20,7 @@
endif
# Use sdl-config if all else fails
ifeq ($(SDL_CFLAGS),)
@@ -570,9 +572,15 @@ else # ifeq mingw32
@@ -570,9 +576,15 @@ else # ifeq mingw32
ifeq ($(PLATFORM),freebsd)
@ -25,7 +36,7 @@
-DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
CLIENT_CFLAGS = $(SDL_CFLAGS)
SERVER_CFLAGS =
@@ -595,27 +603,24 @@ ifeq ($(PLATFORM),freebsd)
@@ -595,29 +607,26 @@ ifeq ($(PLATFORM),freebsd)
# optional features/libraries
ifeq ($(USE_OPENAL),1)
@ -50,16 +61,18 @@
ifeq ($(USE_CODEC_VORBIS),1)
- CLIENT_CFLAGS += -DUSE_CODEC_VORBIS
- endif
-
- ifeq ($(USE_CODEC_VORBIS),1)
- CLIENT_LIBS += -lvorbisfile -lvorbis -logg
+ CLIENT_CFLAGS += -DUSE_CODEC_VORBIS $(VORBIS_CFLAGS)
+ CLIENT_LIBS += $(VORBIS_LIBS)
endif
- ifeq ($(USE_CODEC_VORBIS),1)
- CLIENT_LIBS += -lvorbisfile -lvorbis -logg
- endif
-
# cross-compiling tweaks
@@ -897,7 +902,7 @@ ifeq ($(USE_VOIP),1)
ifeq ($(ARCH),i386)
ifeq ($(CROSS_COMPILING),1)
@@ -897,7 +906,7 @@ ifeq ($(USE_VOIP),1)
CLIENT_CFLAGS += -DUSE_VOIP
SERVER_CFLAGS += -DUSE_VOIP
ifeq ($(USE_INTERNAL_SPEEX),1)
@ -68,3 +81,21 @@
else
CLIENT_LIBS += -lspeex -lspeexdsp
endif
@@ -1564,7 +1573,7 @@ ifeq ($(HAVE_VM_COMPILED),true)
ifeq ($(ARCH),ppc)
Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
endif
- ifeq ($(ARCH),ppc64)
+ ifeq ($(COMPILE_ARCH),ppc64)
Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o
endif
ifeq ($(ARCH),sparc)
@@ -1732,7 +1741,7 @@ ifeq ($(HAVE_VM_COMPILED),true)
ifeq ($(ARCH),ppc)
Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
endif
- ifeq ($(ARCH),ppc64)
+ ifeq ($(COMPILE_ARCH),ppc64)
Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o
endif
ifeq ($(ARCH),sparc)

11
games/openarena/files/patch-code_qcommon_q__platform.h Normal file
View File

@ -0,0 +1,11 @@
--- code/qcommon/q_platform.h.orig 2020-11-23 13:12:36 UTC
+++ code/qcommon/q_platform.h
@@ -235,6 +235,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
#define ARCH_STRING "amd64"
#elif defined __axp__
#define ARCH_STRING "alpha"
+#elif defined __powerpc64__
+#define ARCH_STRING "ppc64"
#endif
#if BYTE_ORDER == BIG_ENDIAN