On Fri, Sep 08, 2023 at 07:46:06PM +0200, Theo Buehler wrote:
> On Fri, Sep 08, 2023 at 05:42:28PM +0000, Lucas Raab wrote:
> > On Fri, Sep 08, 2023 at 05:30:45PM +0000, Brian Callahan wrote:
> > > On 9/8/2023 1:28 PM, Anthony J. Bentley wrote:
> > > > Lucas Raab writes:
> > > >> Currently, devilutionx is broken on arm64 with an immediate crash.
> > > >> Setting
> > > >> USE_NOBTCFI=Yes allows it to run there and still compiles/runs on
> > > >> amd64 as
> > > >> well.
> > > >
> > > > If amd64 works fine without it, maybe wrap the assignment in
> > > > .if ${MACHINE_ARCH} == "aarch64"
> > > > ?
> > > >
> > >
> > > That was my request as well in Lucas's initial email to me.
> > > He tells me that amd64 works (I can't test that myself right now).
> > >
> > > ~Brian
> >
> > oops, I made the change, but promptly forgot to update the diff. Now with
> > 100%
> > more changes...
>
> > +.if ${MACHINE_ARCH} == "aarch64"
> > +USE_NOBTCFI = Yes
>
> USE_NOBTCFI-aarch64 = Yes
>
> Would be great if both USE_NOBTCFI and USE_NOBTCFI-${MACHINE_ARCH}
> could be documented.
>
> > +.endif
> > +
> > MODULES = devel/cmake
> >
> > BUILD_DEPENDS = devel/asio \
>
Updated diff attached, I did not know about USE_NOBTCFI-${MACHINE_ARCH} format,
thanks!
diff /usr/ports
commit - b4cac873f9bedd040bc5529f8b00c47a4906edd5
path + /usr/ports
blob - e8755ae52584ef316d68705d18fa8656a05be8f3
file + games/devilutionx/Makefile
--- games/devilutionx/Makefile
+++ games/devilutionx/Makefile
@@ -5,6 +5,7 @@ CATEGORIES = games x11
GH_ACCOUNT = diasurgical
GH_PROJECT = devilutionX
GH_TAGNAME = 1.5.1
+REVISION = 0
MAINTAINER = Brian Callahan <bcal...@openbsd.org>
@@ -23,6 +24,8 @@ WANTLIB += m mpq smackerdec sodium
# C++20
COMPILER = base-clang ports-gcc
+USE_NOBTCFI-aarch64 = Yes
+
MODULES = devel/cmake
BUILD_DEPENDS = devel/asio \
