Date: Sun, 18 Jun 2023 08:25:41 GMT From: Eugene Grosbein <eugen@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 476e63e7b4e0 - main - net/ng_mikrotik_eoip: unbreak build for FreeBSD before 14.0 Message-ID: <202306180825.35I8Pfk3000154@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=476e63e7b4e0f397ee2f371e0bd1ea75fb0a1758 commit 476e63e7b4e0f397ee2f371e0bd1ea75fb0a1758 Author: Eugene Grosbein <eugen@FreeBSD.org> AuthorDate: 2023-06-18 08:24:06 +0000 Commit: Eugene Grosbein <eugen@FreeBSD.org> CommitDate: 2023-06-18 08:25:34 +0000 net/ng_mikrotik_eoip: unbreak build for FreeBSD before 14.0 PR: 266392 Fixes: c9665e214f726d9a6e62af00d81b94567ebe2572 --- net/ng_mikrotik_eoip/Makefile | 2 -- net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/net/ng_mikrotik_eoip/Makefile b/net/ng_mikrotik_eoip/Makefile index b1450a92f9cc..e419c78eb4bf 100644 --- a/net/ng_mikrotik_eoip/Makefile +++ b/net/ng_mikrotik_eoip/Makefile @@ -10,8 +10,6 @@ WWW= http://imax.in.ua/ng_mikrotik_eoip/ LICENSE= BSD2CLAUSE -BROKEN= compilation fails due to a C error: id = *((unsigned int *)id; error: cast to 'unsigned int *' from smaller integer type 'uint16_t' - USES= kmod uidfix OPTIONS_DEFINE= PTABLE diff --git a/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c b/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c index 4649334fe687..327d32335e6d 100644 --- a/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c +++ b/net/ng_mikrotik_eoip/files/patch-ng__mikrotik__eoip.c @@ -25,7 +25,7 @@ +#if __FreeBSD_version >= 1400057 + id = data->id; +#else -+ id = *((unsigned int *)id; ++ id = *((unsigned int *)arg); +#endif + if (info != NULL && info->id == id) { +#if __FreeBSD_version >= 1400057
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306180825.35I8Pfk3000154>