From nobody Sun Nov 20 22:07:30 2022 X-Original-To: dev-commits-ports-main@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 4NFl4f5W5Mz4hTf0; Sun, 20 Nov 2022 22:07:30 +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 4NFl4f4xSqz3Nfr; Sun, 20 Nov 2022 22:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668982050; 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=KkZv6EaX+JfKdOuUaWiUfhpSyeo2k+KQikq/FceHjCQ=; b=ISolMw7Dr63cWfzJHxQVUTm8I0bOistDm9FFOx19ynZfu61Y0Xcxa1VRljfiXEhFZ4d+H3 hU7rIQo57+4iPaD7wNkC8S0Dd/oje6wjKaHwYyFjdQjJ1S3ZOIzLDf9/cyz1bftVyiaisE hX9iWoPadeodJLv/Mm9Uw9UV0LvDi5RmWXsCONam+rQlLmDDr00woXBoZO8SDqSub5Q4bf LDGXXUw0p58/agGNaJi8CUFKUwiKC2aLtrMI+K9wvQvuJalsUxSdNllqrSqKnFo4wstlL8 AMsWaLHyOteVf3IjkmKHF3NydIDoDnwbTULl/ebeDDcKaRuTMkBFhxqoFQsx1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668982050; 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=KkZv6EaX+JfKdOuUaWiUfhpSyeo2k+KQikq/FceHjCQ=; b=S3hSX7rrVZm8wDHoixJrJtm+Wb2dLHAJrcn5LpmIIiC5OtSG5ts+Fa2lj53YDqjDSB4IES FFa/cntL6HGQtiX85oKUeJiJix5wP0yOe65ELRFz537G/JInL5cJQBO+5l0u7XbypNcT4I 8akY5m/EWP3x3ubEoDIPmterawbUSQ4d5nCiqAu8c5/hcYeVx5lw7L2W4SXn2zuC0lVptY RDCHJ9nIc0ahrIBTkparYGuu+7zqEgszJLFZFIJiwPUCYDAgH+VU2zb9z1VvQp5YY3Rqoy joNkr1geKMUPlehUczLHDbTZZ3tSWfA8A9wbCyG1BTlyN3C7JZO6gXMhkbdPoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668982050; a=rsa-sha256; cv=none; b=jDBgFF76UNmQORAbg6XjySHGwKyyAahvumz9TNjgkh+Lec1IrvBcpksW/Khxb7lt4BFUwT twORk5VXKqBvxoIdG5fdrDhMIUcgCQ+q5m2WHzSJNJRcUkeKDiHEQ1PRtxcJOf9KBO6JH0 dsjDRVqns6xnHPBjDW8H35LyyUAHwf1mlxuAW0spBNg7knawwv7d7xYf4sWAe3w6hRqh+r w3GaznoAY3l82I/6cCtrIiGMiuGfK++rir76pqVRqKF6qFxfnwu+1r0lWZ4gfAFDHHwG0u jAV4V4BR0YWVJ3T/kYRjrjvkltFgYOdPTOmKXwfG9FDssGayqvuYUx7HLCxzLQ== 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 4NFl4f40JDzg1D; Sun, 20 Nov 2022 22:07:30 +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 2AKM7Ubm036832; Sun, 20 Nov 2022 22:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AKM7UJ6036831; Sun, 20 Nov 2022 22:07:30 GMT (envelope-from git) Date: Sun, 20 Nov 2022 22:07:30 GMT Message-Id: <202211202207.2AKM7UJ6036831@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Luca Pizzamiglio Subject: git: b9a0ff1ff036 - main - benchmarks/stress-ng: Update to 0.15.00 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pizzamig X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9a0ff1ff0369d5ddbab929c2852f267da43373b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pizzamig: URL: https://cgit.FreeBSD.org/ports/commit/?id=b9a0ff1ff0369d5ddbab929c2852f267da43373b commit b9a0ff1ff0369d5ddbab929c2852f267da43373b Author: Luca Pizzamiglio AuthorDate: 2022-11-20 22:06:09 +0000 Commit: Luca Pizzamiglio CommitDate: 2022-11-20 22:06:09 +0000 benchmarks/stress-ng: Update to 0.15.00 Add more dependencies jpeg and hashxx Fix opt-out Remove of obsolete patch --- benchmarks/stress-ng/Makefile | 39 ++++++++++++++++++++++++------- benchmarks/stress-ng/distinfo | 6 ++--- benchmarks/stress-ng/files/patch-Makefile | 11 --------- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/benchmarks/stress-ng/Makefile b/benchmarks/stress-ng/Makefile index b9a6e72a2168..f12f9d149ce2 100644 --- a/benchmarks/stress-ng/Makefile +++ b/benchmarks/stress-ng/Makefile @@ -1,7 +1,6 @@ PORTNAME= stress-ng DISTVERSIONPREFIX= V -DISTVERSION= 0.14.06 -PORTREVISION= 0 +DISTVERSION= 0.15.00 CATEGORIES= benchmarks MAINTAINER= pizzamig@FreeBSD.org @@ -11,7 +10,7 @@ WWW= http://kernel.ubuntu.com/~cking/stress-ng/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c11 gmake localbase:ldflags +USES= compiler:c11 gmake jpeg localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= ColinIanKing @@ -19,27 +18,51 @@ ALL_TARGET= # empty PLIST_FILES= bin/stress-ng man/man1/stress-ng.1.gz -OPTIONS_DEFINE= JUDY LIBINOTIFY +OPTIONS_DEFINE= JUDY LIBINOTIFY XXHASH OPTIONS_DEFINE_amd64= INTELIPSEC -OPTIONS_DEFAULT= JUDY LIBINOTIFY +OPTIONS_DEFAULT= JUDY LIBINOTIFY XXHASH OPTIONS_DEFAULT_amd64= INTELIPSEC INTELIPSEC_DESC= Enable support for Intel's IPsec library JUDY_DESC= Enable support for (lib)Judy LIBINOTIFY_DESC= Enable support for libinotify +XXHASH_DESC= Enable support for libxxhash INTELIPSEC_LIB_DEPENDS= libIPSec_MB.so:security/intel-ipsec-mb -INTELIPSEC_MAKE_ARGS_OFF= HAVE_LIB_IPSEC_MB=0 JUDY_LIB_DEPENDS= libJudy.so:devel/judy -JUDY_MAKE_ARGS_OFF= HAVE_LIB_JUDY=0 LIBINOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify LIBINOTIFY_LDFLAGS= -linotify -LIBINOTIFY_MAKE_ARGS_OFF= HAVE_SYS_INOTIFY_H=0 + +XXHASH_LIB_DEPENDS= libxxhash.so:devel/xxhash +XXHASH_LDFLAGS= -lxxhash MAKE_ARGS= VERBOSE=1 +pre-patch: + ${MKDIR} ${WRKSRC}/configs + +#to dsiable Intel IPSEC detection +post-patch-INTELIPSEC-off: + ${TOUCH} ${WRKSRC}/configs/HAVE_LIB_IPSEC_MB + ${TOUCH} ${WRKSRC}/configs/HAVE_INTEL_IPSEC_MB_H + +#to dsiable judy detection +post-patch-JUDY-off: + ${TOUCH} ${WRKSRC}/configs/HAVE_JUDY_H + ${TOUCH} ${WRKSRC}/configs/HAVE_LIB_JUDY + +#to dsiable libinotify detection +post-patch-LIBINOTIFY-off: + ${TOUCH} ${WRKSRC}/configs/HAVE_INOTIFY + ${TOUCH} ${WRKSRC}/configs/HAVE_SYS_INOTIFY + +# To disable libxxhash +post-patch-XXHASH-off: + ${TOUCH} ${WRKSRC}/configs/HAVE_LIB_XXHASH + ${TOUCH} ${WRKSRC}/configs/HAVE_XXHASH_H + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/stress-ng ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/stress-ng.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 diff --git a/benchmarks/stress-ng/distinfo b/benchmarks/stress-ng/distinfo index 3edf39b43bd1..2c4619009556 100644 --- a/benchmarks/stress-ng/distinfo +++ b/benchmarks/stress-ng/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664374944 -SHA256 (ColinIanKing-stress-ng-V0.14.06_GH0.tar.gz) = 54f6c3f84b20efedafd3394ec168e53632a685cfdd76f24270653e898d9ede08 -SIZE (ColinIanKing-stress-ng-V0.14.06_GH0.tar.gz) = 3705069 +TIMESTAMP = 1668965663 +SHA256 (ColinIanKing-stress-ng-V0.15.00_GH0.tar.gz) = cdb18c7dfcdeb0ff2d716c141341d1b2ca6051e4338cee3a555a65f26958c256 +SIZE (ColinIanKing-stress-ng-V0.15.00_GH0.tar.gz) = 3743762 diff --git a/benchmarks/stress-ng/files/patch-Makefile b/benchmarks/stress-ng/files/patch-Makefile deleted file mode 100644 index 3f95f0332201..000000000000 --- a/benchmarks/stress-ng/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2022-09-13 21:31:56 UTC -+++ Makefile -@@ -21,7 +21,7 @@ VERSION=0.14.04 - # - # Codename "annus horribilis" - # --CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 -+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu11 -pipe - - # - # Pedantic flags