On Mon 30/01/2023 22:03, Stuart Henderson wrote:
> On 2023/01/25 14:25, Bjorn Ketelaars wrote:
> > Upstream of borgbackup is slowly moving towards 2.0.0, which will be a
> > major breaking release that is not compatible with existing repos.
> > Additionally, some borg 1.x commands that supported working on a repo
> > AND on an archive have been split into 2 commands, some others were
> > renamed. (Breaking) changes are detailed in
> > https://borgbackup.readthedocs.io/en/2.0.0b4/changes.html#version-2-0-0b4-2022-11-27.
> >
> > Another change is that this new release will use EVP_aes_256_ocb, which
> > is not provided by LibreSSL. As such, OpenSSL is used, which is linked
> > statically to avoid conflicting with shared libcrypto from the base OS
> > pulled in via dependencies.
>
> This fails on i386. It can be built with "MAKE_ENV = LDFLAGS=-Wl,-znotext";
> I offer no opinion on how bad an idea that is, but we did already use it for
> various other ports, mostly which have asm that uses a large number of
> registers.
>
> Full log below, here's the interesting bit:
I do not have another solution for i386.
Diff below OK? (no bump needed).
diff --git sysutils/borgbackup/2.0/Makefile sysutils/borgbackup/2.0/Makefile
index 89b3f5e29dc..fd178c2b686 100644
--- sysutils/borgbackup/2.0/Makefile
+++ sysutils/borgbackup/2.0/Makefile
@@ -16,4 +16,8 @@ RUN_DEPENDS = net/py-msgpack${MODPY_FLAVOR} \
security/py-argon2-cffi${MODPY_FLAVOR}
TEST_DEPENDS = devel/py-dateutil${MODPY_FLAVOR}
+.if ${MACHINE_ARCH} == "i386"
+MAKE_ENV = LDFLAGS=-Wl,-znotex
+.endif
+
.include <bsd.port.mk>
