From nobody Tue Apr 12 16:22:14 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 3CFC37EBFB2; Tue, 12 Apr 2022 16:22:15 +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 4Kd9wl1FSnz4b3y; Tue, 12 Apr 2022 16:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649780535; 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=wF2+TArZvuy0iy4XQ6uyMD0VM8FGAV+BOpV4SmR7P20=; b=o8XgBxRLQsJPSzlCjHp5QO1KoggQ2LRpUDuEZcec8Caq7p6KGw9kWA3q0cIH3vIt+Cfl3s mP9nc+N7pqAIiAVHpbQeoVv/GXMnvpeYclxPaWPIwhk4QM6m0mCG02G9pET4+2KDFzGCnl 26pg0Ga5cbPuPj4/gRRnz/MI+gmLmndN/p+Qj7G/QVwHa4bIkhFouM8LWPwDm9z0rRvnfU tQPwfFENbbZB12usXSIVJVYje4lee8XUDmiXi7REny6s6OxxK3bA1SfDHYWgHaAPf0IUsT GBO4JWy/re5WuD3am7gUtE6J5aaPoCxwxIWEvxiMJ1D3o3alIUnbM3/9kjl8vQ== 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 0AA4E1A933; Tue, 12 Apr 2022 16:22:15 +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 23CGME85086967; Tue, 12 Apr 2022 16:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23CGMECn086966; Tue, 12 Apr 2022 16:22:14 GMT (envelope-from git) Date: Tue, 12 Apr 2022 16:22:14 GMT Message-Id: <202204121622.23CGMECn086966@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 9d4a2bfa6248 - main - devel/liberasurecode: update to 1.6.3 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d4a2bfa624891b509f0ee0fdfcbbc396fbc1bd9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649780535; 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=wF2+TArZvuy0iy4XQ6uyMD0VM8FGAV+BOpV4SmR7P20=; b=mwwDXOmHNBNJmlP7NuavxgoVVOOdJ4wXxkRDCx4T0tFmw6G1nDEW6T470evfkK9UiRLwnh RUrHZfinUavZwKFCEUUxKq79GgQlmh0PlMi3P8h/SfmxHJlEUwRiXvFk5amaNIBzeMjDzz jnLS4oRjc05RfTgGBWTgw/4xN33rQnAMqc69oQ+rk6Rt5Jc5vfnVfB2OThQpkT4baDjJ1p CwTv10rVy+ycSMhL+0I5XzMGqW0vn5QYReB9wt4eSUBoddpBnmbsvbAtJd9JXGb+Dlxa8/ 8DfTdo1cuJYQJqlQT5OsarHnn89qijCVYsSaXgYvM4bRu/1djhxwdvdx+ta4Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649780535; a=rsa-sha256; cv=none; b=L+xvbFsXCsXxVFgGmVyWl75Io81+4LWxDQF1V/sumU3R0EKOgcmrWZZEXGQqlyfUEfGACT XqeIeLtEBT1AtKRlIpgYyvj1VuOEtRhhiQCs5250KWvyXXaC7O2MsMhfpOlDu6272q6mqj sTYAvnbTW20gy6QT/IW29wpC8f3dbTNodhi9QfMlSJY5FQxfQxeYXt2vcL8HqaAHILFIlD 0l5Z4pIfe5xjNMWa2E/lUPqtp9Rbo9/JQIrAvYrxiZw4BWBfKGpFrCMkMMLo9cwyZtbOid z2bkJDAKD9+Xa8ewuK3E5YQUaGpvDi0k6s0ypccZt8GIMISYCpvUL6rjeLV27g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9d4a2bfa624891b509f0ee0fdfcbbc396fbc1bd9 commit 9d4a2bfa624891b509f0ee0fdfcbbc396fbc1bd9 Author: Robert Clausecker AuthorDate: 2022-04-12 13:01:45 +0000 Commit: Tobias C. Berner CommitDate: 2022-04-12 16:00:27 +0000 devel/liberasurecode: update to 1.6.3 - take over maintainership of this unmaintained port - add a DOCS option - add a non-default SIMD option for adapting the binary to the CPU - patch out -Werror more thoroughly Changelog: https://github.com/openstack/liberasurecode/blob/master/ChangeLog PR: 263241 --- devel/liberasurecode/Makefile | 17 +++++++++++++---- devel/liberasurecode/distinfo | 6 +++--- devel/liberasurecode/files/patch-Makefile.am | 11 +++++++++++ devel/liberasurecode/files/patch-doc_Makefile.am | 10 ++++++++++ devel/liberasurecode/files/patch-src_Makefile.am | 11 ----------- devel/liberasurecode/files/patch-test_Makefile.am | 6 +++--- ...st_builtin_rs__vand_liberasurecode__rs__vand__test.c | 6 +++--- devel/liberasurecode/pkg-plist | 3 +-- 8 files changed, 44 insertions(+), 26 deletions(-) diff --git a/devel/liberasurecode/Makefile b/devel/liberasurecode/Makefile index 327599b5854e..8d791b60c563 100644 --- a/devel/liberasurecode/Makefile +++ b/devel/liberasurecode/Makefile @@ -1,18 +1,17 @@ # Created by: Alexander Nusov PORTNAME= liberasurecode -PORTVERSION= 1.4.0 +PORTVERSION= 1.6.3 CATEGORIES= devel -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@fuz.su COMMENT= Unified Erasure Coding interface for common storage workloads LICENSE= BSD2CLAUSE +USES= gmake pkgconfig autoreconf libtool USE_GITHUB= yes GH_ACCOUNT= openstack - -USES= gmake pkgconfig autoreconf libtool USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ @@ -20,4 +19,14 @@ CONFIGURE_ARGS= --with-pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ TEST_TARGET= test +CFLAGS_amd64= -DINTEL_SSE2 + +# documentation file names vary depending on architecture +PORTDOCS= html + +OPTIONS_DEFINE= DOCS SIMD +DOCS_CONFIGURE_ENABLE= doxygen +DOCS_BUILD_DEPENDS= doxygen:devel/doxygen +SIMD_CONFIGURE_ENABLE= mmi + .include diff --git a/devel/liberasurecode/distinfo b/devel/liberasurecode/distinfo index f195764e28e5..d76993b00dda 100644 --- a/devel/liberasurecode/distinfo +++ b/devel/liberasurecode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1491476820 -SHA256 (openstack-liberasurecode-1.4.0_GH0.tar.gz) = 71b3ed74147a042c6fa857261269bd348979ee28256156ce5ac045f30f2035cc -SIZE (openstack-liberasurecode-1.4.0_GH0.tar.gz) = 206187 +TIMESTAMP = 1649694909 +SHA256 (openstack-liberasurecode-1.6.3_GH0.tar.gz) = 8c1afa0a4d5f4909ae864a5d00381b963b4a179364ba591611ceb634c3c9eb99 +SIZE (openstack-liberasurecode-1.6.3_GH0.tar.gz) = 210599 diff --git a/devel/liberasurecode/files/patch-Makefile.am b/devel/liberasurecode/files/patch-Makefile.am new file mode 100644 index 000000000000..3c1f0b30195c --- /dev/null +++ b/devel/liberasurecode/files/patch-Makefile.am @@ -0,0 +1,11 @@ +--- Makefile.am.orig 2022-04-08 23:59:40 UTC ++++ Makefile.am +@@ -8,7 +8,7 @@ INCLUDE = -I$(abs_top_builddir)/include \ + -I$(abs_top_builddir)/include/xor_codes + + AM_CPPFLAGS = $(CPPFLAGS) $(INCLUDE) +-AM_CPPFLAGS += -Werror -Wall ++AM_CPPFLAGS += -Wall + + AM_CFLAGS = -fPIC $(AM_CPPFLAGS) @GCOV_FLAGS@ -L/usr/local/lib + diff --git a/devel/liberasurecode/files/patch-doc_Makefile.am b/devel/liberasurecode/files/patch-doc_Makefile.am new file mode 100644 index 000000000000..c86697289992 --- /dev/null +++ b/devel/liberasurecode/files/patch-doc_Makefile.am @@ -0,0 +1,10 @@ +--- doc/Makefile.am.orig 2022-04-12 08:07:13 UTC ++++ doc/Makefile.am +@@ -1,5 +1,5 @@ + DOC_MODULE=@PACKAGE@ +-HTML_DIR=$(datadir)/$(DOC_MODULE)/html ++HTML_DIR=$(docdir)/html +-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) ++TARGET_DIR=$(HTML_DIR) + + all-local: html/index.html diff --git a/devel/liberasurecode/files/patch-src_Makefile.am b/devel/liberasurecode/files/patch-src_Makefile.am deleted file mode 100644 index a84827e7e604..000000000000 --- a/devel/liberasurecode/files/patch-src_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.am.orig 2017-04-14 13:42:39 UTC -+++ src/Makefile.am -@@ -28,7 +28,7 @@ liberasurecode_la_SOURCES = \ - builtin/rs_vand/rs_galois.c \ - backends/shss/shss.c - --liberasurecode_la_CPPFLAGS = -Werror @GCOV_FLAGS@ -+liberasurecode_la_CPPFLAGS = @GCOV_FLAGS@ - liberasurecode_la_LIBADD = \ - builtin/null_code/libnullcode.la -lpthread -lm @GCOV_LDFLAGS@ \ - builtin/xor_codes/libXorcode.la -lpthread -lm @GCOV_LDFLAGS@ \ diff --git a/devel/liberasurecode/files/patch-test_Makefile.am b/devel/liberasurecode/files/patch-test_Makefile.am index c1b20b8292aa..b0a361639c31 100644 --- a/devel/liberasurecode/files/patch-test_Makefile.am +++ b/devel/liberasurecode/files/patch-test_Makefile.am @@ -1,4 +1,4 @@ ---- test/Makefile.am.orig 2017-04-06 11:15:44 UTC +--- test/Makefile.am.orig 2022-04-08 23:59:40 UTC +++ test/Makefile.am @@ -5,22 +5,22 @@ test_xor_hd_code_SOURCES = \ builtin/xor_codes/test_xor_hd_code.c \ @@ -16,8 +16,8 @@ liberasurecode_test_SOURCES = liberasurecode_test.c liberasurecode_test_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/erasurecode @GCOV_FLAGS@ --liberasurecode_test_LDFLAGS = @GCOV_LDFLAGS@ $(top_builddir)/src/liberasurecode.la -ldl -lpthread -+liberasurecode_test_LDFLAGS = @GCOV_LDFLAGS@ $(top_builddir)/src/liberasurecode.la -lpthread +-liberasurecode_test_LDFLAGS = @GCOV_LDFLAGS@ $(top_builddir)/src/liberasurecode.la -ldl -lpthread -lz ++liberasurecode_test_LDFLAGS = @GCOV_LDFLAGS@ $(top_builddir)/src/liberasurecode.la -lpthread -lz check_PROGRAMS += liberasurecode_test libec_slap_SOURCES = libec_slap.c diff --git a/devel/liberasurecode/files/patch-test_builtin_rs__vand_liberasurecode__rs__vand__test.c b/devel/liberasurecode/files/patch-test_builtin_rs__vand_liberasurecode__rs__vand__test.c index 243ba4b772da..f77767ddc48e 100644 --- a/devel/liberasurecode/files/patch-test_builtin_rs__vand_liberasurecode__rs__vand__test.c +++ b/devel/liberasurecode/files/patch-test_builtin_rs__vand_liberasurecode__rs__vand__test.c @@ -1,8 +1,8 @@ ---- test/builtin/rs_vand/liberasurecode_rs_vand_test.c.orig 2017-04-06 11:14:01 UTC +--- test/builtin/rs_vand/liberasurecode_rs_vand_test.c.orig 2022-04-08 23:59:40 UTC +++ test/builtin/rs_vand/liberasurecode_rs_vand_test.c -@@ -32,6 +32,10 @@ - #include +@@ -33,6 +33,10 @@ #include + #include +#ifdef __FreeBSD__ +#include diff --git a/devel/liberasurecode/pkg-plist b/devel/liberasurecode/pkg-plist index b0753f08ebca..6afa592c4d38 100644 --- a/devel/liberasurecode/pkg-plist +++ b/devel/liberasurecode/pkg-plist @@ -26,7 +26,7 @@ lib/libXorcode.so.1.0.1 lib/liberasurecode.a lib/liberasurecode.so lib/liberasurecode.so.1 -lib/liberasurecode.so.1.4.0 +lib/liberasurecode.so.1.6.3 lib/liberasurecode_rs_vand.a lib/liberasurecode_rs_vand.so lib/liberasurecode_rs_vand.so.1 @@ -36,4 +36,3 @@ lib/libnullcode.so lib/libnullcode.so.1 lib/libnullcode.so.1.0.1 libdata/pkgconfig/erasurecode-1.pc -@dir %%DATADIR%%/html/liberasurecode