From nobody Sun Jun 12 19:54:21 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1E041846FB1; Sun, 12 Jun 2022 19:54:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LLllK6hytz3Mc1; Sun, 12 Jun 2022 19:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655063662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uld1+BKE9/CLOBMOrbU1bmpMlVIWiMu0hjQkExJOnp4=; b=B8OUo66H2d9co0jLwFLXu168qHtuqAL2R4ZtB9IJqsT5eM+zfjIO5iNBT7rINdEXqN6ygU 3aVh8xssSX4FpYTNpKOPTKYfbQHxcmK+D2jZEWL50UE6shLJTHms6Ja6zysUI1Y5KHHYkn laDjTN+Q5W3YWVWsvzQsW3lEpPEjsBkpInHny1Ry2mtUzHA4U3bLYp1aPwCr5dujpl9yqO uyjkW2vmk8IvWr8obBbNXbcbrD/+9gHRTH1RG3hL+V7FNqo/J5VE+GwX/UG1UqxKMSONZh oAoE4BphiELdmKbVyeGe1RCRSneKAG+8f/W2TjVyQOel8/0XqaaxJ/XK/St1IQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C6F0A27A35; Sun, 12 Jun 2022 19:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25CJsLQO009132; Sun, 12 Jun 2022 19:54:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25CJsLWp009131; Sun, 12 Jun 2022 19:54:21 GMT (envelope-from git) Date: Sun, 12 Jun 2022 19:54:21 GMT Message-Id: <202206121954.25CJsLWp009131@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: 16f00133d92b - main - net-mgmt/pmacct: fix build on armv7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16f00133d92bda820f660e0c51575865d7a259b7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655063662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uld1+BKE9/CLOBMOrbU1bmpMlVIWiMu0hjQkExJOnp4=; b=YxSMYAwf0RyR30e8W2jEmds3YI9bZvkAVwN5PlCCsCRutNx8Z1JitZh0F864CS7p/Hf/W9 EUEfPE2ux32w6rMEtKqIrD6ZFzy5v5IgBO30Z3Xw6HQsnbf11gZLffiCbEfqn7rDDUZj+6 caUZ1CllE2OpHAa1iCCJoqlo9ZnNJn0P+6TDtlBwQcbF0mlyFRsI7K6xCPj7ZuEhIM7kwd TT5JfqH+5Z5ZajlJ3hceg90CV1zyD9c2IRc/sQwCRU1qlQLSegB5BQajAA9KcBCHG+uXIu xx4bAHfn0kLOUKp2bh2vxzM1QmH2+3wwdyITQpaSF3MlOFe0aeeaCqda8m6WJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655063662; a=rsa-sha256; cv=none; b=eRiYUMpY/jBD4lxS+iChhREbehQKsj3L1DZ1zglpFnfvHGgfTfVUZkSfVaKSBz3+BGCcVo HaaN8beVoCSplxYrNylX+3jAgCJ3kddq4hEGwCHsMsEGT/hUXWBV3RHy3UuuNd7crNw1C/ zfGke0uBcj7GleXqMynaqwM1QkpRQ6tAcbpGhUN1OtQ41WftyRIHll9euawj7TDfFL2N8k sJcWs3ewHtv+gPV2a1khdy61B8dFj0k0PywYt1MmM/9n051hjaicU3HGqRbeHsmDI3mh/y NvhN1iybPlVQKa0Ca77vbiCT/SyCUr/RV5WSRl7Lez/mWVpIawW25ciJLUE6ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=16f00133d92bda820f660e0c51575865d7a259b7 commit 16f00133d92bda820f660e0c51575865d7a259b7 Author: Robert Clausecker AuthorDate: 2022-06-12 19:53:01 +0000 Commit: Kurt Jaeger CommitDate: 2022-06-12 19:53:01 +0000 net-mgmt/pmacct: fix build on armv7 PR: 260194 Author: Robert Clausecker --- net-mgmt/pmacct/Makefile | 2 +- net-mgmt/pmacct/files/patch-configure.ac | 20 ++++++++++++++++++++ net-mgmt/pmacct/files/patch-src_bgp_bgp.c | 14 ++++++++++++++ .../files/patch-src_external__libs_Makefile.am | 16 ++++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile index b160bd88c9ad..815a01d92e75 100644 --- a/net-mgmt/pmacct/Makefile +++ b/net-mgmt/pmacct/Makefile @@ -10,7 +10,7 @@ COMMENT= Accounting and aggregation tool for IPv4 and IPv6 traffic LICENSE= GPLv2 -USES= libtool pkgconfig localbase autoreconf +USES= gmake libtool pkgconfig localbase autoreconf USE_RC_SUBR= pmacctd nfacctd sfacctd SUB_FILES= pkg-message GNU_CONFIGURE= yes diff --git a/net-mgmt/pmacct/files/patch-configure.ac b/net-mgmt/pmacct/files/patch-configure.ac new file mode 100644 index 000000000000..c917463ca363 --- /dev/null +++ b/net-mgmt/pmacct/files/patch-configure.ac @@ -0,0 +1,20 @@ +--- configure.ac.orig 2021-11-05 16:03:23.000000000 +0100 ++++ configure.ac 2022-04-15 16:15:06.250117000 +0200 +@@ -404,9 +404,14 @@ + AC_CHECK_HEADERS([mysql.h mysql/mysql.h]) + CFLAGS="$_save_CFLAGS" + +- AC_CHECK_LIB([numa], [numa_bind], [], [AC_MSG_ERROR([ +- ERROR: missing libnuma. Requirement for building MySQL. +- ])]) ++ case "$host_os" in ++ linux*) ++ AC_CHECK_LIB([numa], [numa_bind], [], [AC_MSG_ERROR([ ++ ERROR: missing libnuma. Requirement for building MySQL. ++ ])]) ++ ;; ++ esac ++ + ;; + no) + AC_MSG_RESULT(no) diff --git a/net-mgmt/pmacct/files/patch-src_bgp_bgp.c b/net-mgmt/pmacct/files/patch-src_bgp_bgp.c new file mode 100644 index 000000000000..3c500325b54d --- /dev/null +++ b/net-mgmt/pmacct/files/patch-src_bgp_bgp.c @@ -0,0 +1,14 @@ +--- src/bgp/bgp.c.orig 2022-05-28 08:30:21 UTC ++++ src/bgp/bgp.c +@@ -830,9 +830,9 @@ void skinny_bgp_daemon_online() + bgp_peer_close(&peers[peers_check_idx], FUNC_TYPE_BGP, FALSE, FALSE, FALSE, FALSE, NULL); + } + else { +- Log(LOG_WARNING, "WARN ( %s/%s ): [%s] Refusing new connection from existing peer (residual holdtime: %ld).\n", ++ Log(LOG_WARNING, "WARN ( %s/%s ): [%s] Refusing new connection from existing peer (residual holdtime: %lld).\n", + config.name, bgp_misc_db->log_str, bgp_peer_str, +- (peers[peers_check_idx].ht - ((long)now - peers[peers_check_idx].last_keepalive))); ++ (long long)(peers[peers_check_idx].ht - ((long)now - peers[peers_check_idx].last_keepalive))); + FD_CLR(peer->fd, &bkp_read_descs); + bgp_peer_close(peer, FUNC_TYPE_BGP, FALSE, FALSE, FALSE, FALSE, NULL); + goto read_data; diff --git a/net-mgmt/pmacct/files/patch-src_external__libs_Makefile.am b/net-mgmt/pmacct/files/patch-src_external__libs_Makefile.am new file mode 100644 index 000000000000..aac851998bc8 --- /dev/null +++ b/net-mgmt/pmacct/files/patch-src_external__libs_Makefile.am @@ -0,0 +1,16 @@ +--- src/external_libs/Makefile.am.orig 2021-11-05 15:03:23.000000000 +0000 ++++ src/external_libs/Makefile.am 2022-04-15 12:37:36.692736000 +0000 +@@ -45,11 +45,12 @@ + fi;\ + echo "[dep: libcdada] Building...";\ + mkdir -p $(abs_builddir)/libcdada/build || true; \ ++ unset LIBS; \ + cd $(abs_srcdir)/libcdada/ && \ + ./autogen.sh &&\ + cd $(abs_builddir)/libcdada/build && \ + $(abs_srcdir)/libcdada/configure --disable-shared --host=$(host_alias) @configure_silent_rules_val@ \ +- --prefix=$(abs_builddir)/rootfs && make $(MAKE_JOBS) install;\ ++ --prefix=$(abs_builddir)/rootfs && gmake $(MAKE_JOBS) install;\ + if [ $$? != 0 ]; then exit 1; fi; \ + echo "`cd $(abs_srcdir)/libcdada && git rev-parse HEAD 2> /dev/null`" > $(abs_builddir)/.libcdada_mark;\ + if [ $$? != 0 ]; then exit 1; fi; \