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

fix build on aarch64.

Browse Source 
armhf was renamed to arm for aarch64, so rename our local changes.

OK kurt@ and MAINTAINER Dimitri Karamazov
This commit is contained in:
phessler 2021-10-31 13:00:03 +00:00
parent 0933653183
commit 94a22eb2b5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/tanukiwrapper/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2021/10/16 08:07:39 rsadowski Exp $
# $OpenBSD: Makefile,v 1.24 2021/10/31 13:00:03 phessler Exp $
COMMENT= Tanuki Java Service Wrapper
@ -31,7 +31,7 @@ MAKE_ARCH=x86-32
.elif ${MACHINE_ARCH} == "amd64"
MAKE_ARCH=x86-64
.elif ${MACHINE_ARCH} == "aarch64"
MAKE_ARCH=armhf-64
MAKE_ARCH=arm-64
.elif ${MACHINE_ARCH} == "sparc64"
MAKE_ARCH=sparc-64
.endif

0
java/tanukiwrapper/files/Makefile-openbsd-armhf-64.gmake → java/tanukiwrapper/files/Makefile-openbsd-arm-64.gmake
View File

4
java/tanukiwrapper/patches/patch-build_xml
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-build_xml,v 1.5 2021/10/16 08:07:39 rsadowski Exp $
$OpenBSD: patch-build_xml,v 1.6 2021/10/31 13:00:04 phessler Exp $
define OpenBSD property
@ -37,7 +37,7 @@ Index: build.xml
<release-delta-extract-platform osname="linux" osarch="arm" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="openbsd" osarch="x86" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="openbsd" osarch="x86" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="openbsd" osarch="armhf" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="openbsd" osarch="arm" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="openbsd" osarch="sparc" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
</target>
<target name="release-delta" depends="pre-release:check, release-delta:init, release-delta:extract-platforms">