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

On riscv64 scons appends "rv64" instead of "64" to executables names

Browse Source 
Probably an unintended side effect from the logic in the scons build
scripts.  Duplicate this logic in the port Makefile instead of using the
ksh extended glob trick from my initial diff.  This fixes packaging on
riscv64.  Also tested on amd64 and arm64 (tb@).

ok sthen@ op@ (maintainer)
This commit is contained in:
jca 2022-08-09 11:37:39 +00:00
parent e6e44ef3a9
commit fed3004283
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
games/godot/Makefile
View File

@ -99,6 +99,15 @@ NO_TEST = Yes
DPB_PROPERTIES = parallel
.include <bsd.port.arch.mk>
.if ${MACHINE_ARCH} == "riscv64"
BINSUFFIX = rv64
.elif ${PROPERTIES:Mlp64}
BINSUFFIX = 64
.else
BINSUFFIX = 32
.endif
.if ${MACHINE_ARCH:Mhppa}
LDFLAGS += -latomic
WANTLIB += atomic
@ -123,9 +132,9 @@ do-build:
@${MODSCONS_BUILD_TARGET} tools=yes target=release_debug
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot.x11.opt.[36]* \
${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot.x11.opt.${BINSUFFIX} \
${PREFIX}/bin/godot
${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot.x11.opt.tools.* \
${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot.x11.opt.tools.${BINSUFFIX} \
${PREFIX}/bin/godot-tools
${INSTALL_MAN_DIR} ${PREFIX}/man/man6
${INSTALL_MAN} ${WRKSRC}/misc/dist/linux/godot.6 \