Date: Wed, 04 Feb 2026 12:41:38 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: cfc41e9bfe63 - main - net/tcpkali: fix build on FreeBSD 15 Message-ID: <69833e82.308d3.26debb13@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=cfc41e9bfe637015f4710e0c745779dee738f478 commit cfc41e9bfe637015f4710e0c745779dee738f478 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-01-28 00:55:59 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-02-04 12:41:14 +0000 net/tcpkali: fix build on FreeBSD 15 Our new inotify support confuses the bundled libev. Unbundle libev to fix the build. Something is fishy with this port; the upstream repository does not exist anymore and the one listed in WWW is blank. This should be investigated. MFH: 2026Q1 --- net/tcpkali/Makefile | 12 +++++++++--- net/tcpkali/files/patch-configure.ac | 23 +++++++++++++++-------- net/tcpkali/files/patch-deps_Makefile.am | 7 +++++++ net/tcpkali/files/patch-src_Makefile.am | 18 ++++++++++++++++++ 4 files changed, 49 insertions(+), 11 deletions(-) diff --git a/net/tcpkali/Makefile b/net/tcpkali/Makefile index 5c14fa33fa56..1307e8bbe2b3 100644 --- a/net/tcpkali/Makefile +++ b/net/tcpkali/Makefile @@ -1,6 +1,6 @@ PORTNAME= tcpkali PORTVERSION= 1.1.1.20180104 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= net @@ -11,16 +11,22 @@ WWW= https://github.com/satori-com/tcpkali LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -GNU_CONFIGURE= yes -USES= autoreconf compiler:c11 libtool gmake ncurses +LIB_DEPENDS= libev.so:devel/libev +GNU_CONFIGURE= yes +USES= autoreconf compiler:c11 libtool gmake ncurses localbase USE_GITHUB= yes GH_ACCOUNT= machinezone GH_TAGNAME= 3c3175e417366c7ccafba56454903690fede501a +LIBS= -lpthread -lev + PLIST_FILES= bin/${PORTNAME} \ share/man/man1/${PORTNAME}.1.gz +post-extract: + ${RM} -r ${WRKSRC}/deps/libev + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1 diff --git a/net/tcpkali/files/patch-configure.ac b/net/tcpkali/files/patch-configure.ac index ba880ad900b1..4fb840dcab8e 100644 --- a/net/tcpkali/files/patch-configure.ac +++ b/net/tcpkali/files/patch-configure.ac @@ -1,11 +1,18 @@ ---- configure.ac.orig 2016-09-30 05:30:34 UTC +--- configure.ac.orig 2026-01-28 00:52:04 UTC +++ configure.ac -@@ -18,7 +18,7 @@ AX_PTHREAD([]) - dnl Global CFLAGS, for tcpkali and its third-party dependencies. +@@ -27,7 +27,6 @@ dnl Third-party dependencies. + Install 'bison' package first.])]) - CC="${PTHREAD_CC}" --LIBS="${PTHREAD_LIBS} ${LIBS}" -+LIBS="-lpthread ${LIBS}" - CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" + dnl Third-party dependencies. +-m4_include([deps/libev/libev.m4]) + m4_include([deps/libstatsd/libstatsd.m4]) - AC_CHECK_PROGS([YACC], ['bison -y' byacc]) + dnl Import locally defined macros. +@@ -155,7 +154,6 @@ AC_CONFIG_FILES([Makefile + src/Makefile + doc/Makefile + deps/Makefile +- deps/libev/Makefile + deps/libcows/Makefile + deps/libstatsd/Makefile + deps/libstatsd/man/Makefile diff --git a/net/tcpkali/files/patch-deps_Makefile.am b/net/tcpkali/files/patch-deps_Makefile.am new file mode 100644 index 000000000000..d39615989827 --- /dev/null +++ b/net/tcpkali/files/patch-deps_Makefile.am @@ -0,0 +1,7 @@ +--- deps/Makefile.am.orig 2026-01-28 00:47:27 UTC ++++ deps/Makefile.am +@@ -1,3 +1,3 @@ + +-SUBDIRS = libev libcows libstatsd HdrHistogram boyer-moore-horspool pcg-c-basic ++SUBDIRS = libcows libstatsd HdrHistogram boyer-moore-horspool pcg-c-basic + diff --git a/net/tcpkali/files/patch-src_Makefile.am b/net/tcpkali/files/patch-src_Makefile.am new file mode 100644 index 000000000000..fe4ade426de5 --- /dev/null +++ b/net/tcpkali/files/patch-src_Makefile.am @@ -0,0 +1,18 @@ +--- src/Makefile.am.orig 2026-01-28 00:53:46 UTC ++++ src/Makefile.am +@@ -6,7 +6,6 @@ tcpkali_CPPFLAGS = $(TK_CPPFLAGS) \ + + tcpkali_CPPFLAGS = $(TK_CPPFLAGS) \ + -I$(top_srcdir)/asn1 \ +- -I$(top_srcdir)/deps/libev \ + -I$(top_srcdir)/deps/libcows \ + -I$(top_srcdir)/deps/libstatsd/src \ + -I$(top_srcdir)/deps/HdrHistogram \ +@@ -40,7 +39,6 @@ tcpkali_LDADD = $(top_builddir)/asn1/libasncodec.la \ + tcpkali.c tcpkali.h + tcpkali_LDFLAGS = $(TK_LDFLAGS) $(TK_LIBS) -L$(libdir) $(LIBUV) + tcpkali_LDADD = $(top_builddir)/asn1/libasncodec.la \ +- $(top_builddir)/deps/libev/libev.la \ + $(top_builddir)/deps/libcows/libcows.la \ + $(top_builddir)/deps/pcg-c-basic/libpcg32.la \ + $(top_builddir)/deps/libstatsd/src/libstatsd.la \home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69833e82.308d3.26debb13>