From owner-dev-commits-ports-all@freebsd.org Wed Jun 16 23:46:02 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 00D1F647986; Wed, 16 Jun 2021 23:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G51zF60gLz4ZtH; Wed, 16 Jun 2021 23:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B61E624C4E; Wed, 16 Jun 2021 23:46:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15GNk1H8096092; Wed, 16 Jun 2021 23:46:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15GNk11D096091; Wed, 16 Jun 2021 23:46:01 GMT (envelope-from git) Date: Wed, 16 Jun 2021 23:46:01 GMT Message-Id: <202106162346.15GNk11D096091@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 0c5491c62a09 - main - games/openarena: fix build on powerpc MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c5491c62a091b3024af54e3db272898dfc0b1ed Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 23:46:02 -0000 The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c5491c62a091b3024af54e3db272898dfc0b1ed commit 0c5491c62a091b3024af54e3db272898dfc0b1ed Author: Piotr Kubaj AuthorDate: 2021-06-16 23:45:47 +0000 Commit: Piotr Kubaj CommitDate: 2021-06-16 23:45:47 +0000 games/openarena: fix build on powerpc Similar fix to powerpc64*. --- games/openarena/files/patch-Makefile | 28 ++++++++++++++-------- .../files/patch-code_qcommon_q__platform.h | 4 +++- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/games/openarena/files/patch-Makefile b/games/openarena/files/patch-Makefile index a68f3a1572a0..ff7c1da8d249 100644 --- a/games/openarena/files/patch-Makefile +++ b/games/openarena/files/patch-Makefile @@ -11,17 +11,17 @@ ifeq ($(COMPILE_PLATFORM),mingw32) ifeq ($(COMPILE_ARCH),i386) -@@ -70,6 +74,9 @@ +@@ -70,6 +74,9 @@ endif ifeq ($(COMPILE_ARCH),powerpc64) COMPILE_ARCH=ppc64 endif +ifeq ($(COMPILE_ARCH),powerpc64le) + COMPILE_ARCH=ppc64le +endif - + ifndef ARCH ARCH=$(COMPILE_ARCH) -@@ -205,6 +209,8 @@ ifneq ($(BUILD_CLIENT),0) +@@ -205,6 +212,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) @@ -30,7 +30,7 @@ endif # Use sdl-config if all else fails ifeq ($(SDL_CFLAGS),) -@@ -570,9 +576,15 @@ else # ifeq mingw32 +@@ -570,9 +579,15 @@ else # ifeq mingw32 ifeq ($(PLATFORM),freebsd) @@ -46,7 +46,7 @@ -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON CLIENT_CFLAGS = $(SDL_CFLAGS) SERVER_CFLAGS = -@@ -595,29 +607,26 @@ ifeq ($(PLATFORM),freebsd) +@@ -595,29 +610,26 @@ ifeq ($(PLATFORM),freebsd) # optional features/libraries ifeq ($(USE_OPENAL),1) @@ -82,7 +82,7 @@ # cross-compiling tweaks ifeq ($(ARCH),i386) ifeq ($(CROSS_COMPILING),1) -@@ -897,7 +906,7 @@ ifeq ($(USE_VOIP),1) +@@ -897,7 +909,7 @@ ifeq ($(USE_VOIP),1) CLIENT_CFLAGS += -DUSE_VOIP SERVER_CFLAGS += -DUSE_VOIP ifeq ($(USE_INTERNAL_SPEEX),1) @@ -91,8 +91,12 @@ else CLIENT_LIBS += -lspeex -lspeexdsp endif -@@ -1564,9 +1576,12 @@ - ifeq ($(ARCH),ppc) +@@ -1561,12 +1573,15 @@ ifeq ($(HAVE_VM_COMPILED),true) + ifeq ($(ARCH),amd64) + Q3OBJ += $(B)/client/vm_x86_64.o $(B)/client/vm_x86_64_assembler.o + endif +- ifeq ($(ARCH),ppc) ++ ifeq ($(COMPILE_ARCH),ppc) Q3OBJ += $(B)/client/vm_powerpc.o $(B)/client/vm_powerpc_asm.o endif - ifeq ($(ARCH),ppc64) @@ -105,8 +109,12 @@ ifeq ($(ARCH),sparc) Q3OBJ += $(B)/client/vm_sparc.o endif -@@ -1732,7 +1747,10 @@ - ifeq ($(ARCH),ppc) +@@ -1729,10 +1744,13 @@ ifeq ($(HAVE_VM_COMPILED),true) + ifeq ($(ARCH),amd64) + Q3DOBJ += $(B)/ded/vm_x86_64.o $(B)/ded/vm_x86_64_assembler.o + endif +- ifeq ($(ARCH),ppc) ++ ifeq ($(COMPILE_ARCH),ppc) Q3DOBJ += $(B)/ded/vm_powerpc.o $(B)/ded/vm_powerpc_asm.o endif - ifeq ($(ARCH),ppc64) diff --git a/games/openarena/files/patch-code_qcommon_q__platform.h b/games/openarena/files/patch-code_qcommon_q__platform.h index 1cf318c2b6ba..241faa4dcaea 100644 --- a/games/openarena/files/patch-code_qcommon_q__platform.h +++ b/games/openarena/files/patch-code_qcommon_q__platform.h @@ -1,11 +1,13 @@ --- 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, +@@ -235,6 +235,10 @@ 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" ++#elif defined __powerpc__ ++#define ARCH_STRING "ppc" #endif #if BYTE_ORDER == BIG_ENDIAN