diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-04-21 12:05:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-04-21 12:05:28 +0100 |
| commit | 490ef2c2dc8b4e808f37add1adee21a754efd9a9 (patch) | |
| tree | e235cdf15550b3d2f644b6fc4a8aa726971416f5 /dev-libs/hiredis | |
| parent | da7ae1dd1fccb6b3c0e4763ab983ad96d57bf463 (diff) | |
gentoo auto-resync : 21:04:2024 - 12:05:28
Diffstat (limited to 'dev-libs/hiredis')
| -rw-r--r-- | dev-libs/hiredis/Manifest | 5 | ||||
| -rw-r--r-- | dev-libs/hiredis/files/hiredis-1.2.0-conditional-werror.patch | 24 | ||||
| -rw-r--r-- | dev-libs/hiredis/hiredis-1.1.0-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/hiredis/hiredis-1.2.0.ebuild | 23 |
4 files changed, 41 insertions, 13 deletions
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest index 86b34d585a39..2851d1ce9ea2 100644 --- a/dev-libs/hiredis/Manifest +++ b/dev-libs/hiredis/Manifest @@ -1,9 +1,10 @@ AUX hiredis-1.0.0-disable-network-tests.patch 1760 BLAKE2B 9e2837834e0e7b0411ad4349a16c89d060c6b77552c98c11c03048f3f9ebbc16c47de3d9428ea3fa83da8878d1404eea8d9cd62b6e561104ec81c155507fd75b SHA512 d7d24991d29712e697ee22716933ea0c78e743d1689a452dab13d0d7e1a865ba479c08b17d4a743d05880e22d652c97f7b5fb4250841f14040696fdbd1e86390 AUX hiredis-1.1.0-disable-network-tests.patch 623 BLAKE2B 78b8f5f09c3b80c25b559c1da9ac30a125743a1caef3c4f4b03c84c362d27ba80a8423665506ca332b48213eb831b1bb69e30ad656a5b7fd59282cddd071cbb4 SHA512 4612ef5dab7968aca125de85de4d460abcd7d3ba4bb420d363120009547803770af30a19767dec9e6579540e7155f4e03a3e162c57f7ed6898b03c93299c8046 +AUX hiredis-1.2.0-conditional-werror.patch 1059 BLAKE2B 841adc2860abf98113cd0512853e7bb6979f290100078a1c780596b7e1876fd07067f68041f071aeb586403e49a2e35ea031cfddf08b3f480b08328ad8235912 SHA512 1a1441678bedacaa461cecd80d7c61940c7bca1593b30ddf4a270900285034ae64a84672ad718e23f39494d3cb3be6c66275e5ff3241a3c76a6a9220c45680be DIST hiredis-1.0.2.tar.gz 98139 BLAKE2B 86d872cfec3d4e925d5d68e4f4faf1301aa6d706bd0406a8080471e14afc2c25db13b9a0937d29baccd457611af8e46922b5379183c7470c9ae1860aac3af096 SHA512 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b DIST hiredis-1.1.0.tar.gz 122002 BLAKE2B 74c23816e59ea241c68640f99970ae68536a1cd605ac1a7146bf52e355f5f74b3d39fb81be02741cf776c06b47b9d5acc7ec66bfdcf802dec3ed68fb28a82b1b SHA512 9dad012c144ed24de6aa413a3a10d19a9d0d9ece18dbc388406cd86c5b98cb66c76c586cb559c601ed13a75051d8921dc2882534cc3605513fde47d57276c3bb DIST hiredis-1.2.0.tar.gz 126216 BLAKE2B 3f0b74205fb4ceb42fb4c1700a9bf95cf2ad2d9880ee1f2da9cbed6096cde5e918b01465ce9d6ec1b29b5934cfa6ab41000ed344a9983cebe6bd1bf64ac0ede1 SHA512 f8984abb29c09e7e6b56e656616c5155f36c53da4161a2d4c85688486411cadcdf20aa1adb9bda208c500b401c750871be1c8d58ba9df5328634d00e9d1b6589 EBUILD hiredis-1.0.2-r3.ebuild 2100 BLAKE2B b1e1c2b0bdd70f768955069d8e67580df16af9e6b73095a7595067925fd37d21fe7f7a596810e68463f550780fc0b6c2fb7e05efa942b1e54e92edbd87a5e433 SHA512 2f538e9663ffcc6340458518ae7cec37447d40d807ad02dbefe988c6bfbbab696602b3ac4cceb56a201ef3e663887a173107a8d92e0779bdee6490ae229b9a96 -EBUILD hiredis-1.1.0-r1.ebuild 2253 BLAKE2B 1987ad1fb7f7e36b98139e33a299523e4e617f6650653409d72798c139cc6aa51aa2a0528564368379e44aa47aefcfcc5765c120bd1dc75d7d87a625fdbcc6b9 SHA512 2e0de21042066a3b49be32eaebaf8197e27e2eda2d478cdcd05feae5463c255b1cc420bba7ed1ffe5c67070ad2dc89ced3bec742e8c3041bbed9f72a66f87a46 -EBUILD hiredis-1.2.0.ebuild 2142 BLAKE2B 3782188e89fde381540b2d4dad27cb53f57941653e4c2c2fb64018fa878480d5708c65a0e3f37284fb5bcb05b4406c15463ffb7f111a30f1c81ed91a024f98b9 SHA512 9205477c493a3338adb6451fef76c77a9e1c785b47d4c8bdb6c052020e5849342c46317cd14ce1ea9e0cdbb770cf591dc45c2d24f329b90aea86b5ff110a9fdb +EBUILD hiredis-1.1.0-r1.ebuild 2251 BLAKE2B b8799a7d6d2a281fbf5e94c39ec30a21b58fcb1f20bff8bcd087ba2a18bff09e96968969cd3a57690275a24fd1b55eeacd4be5dd7f646ab48780ac9ed96cb8df SHA512 a0c763c532e3a36744941b993d06b650df0ed558168de42ba9bc25eb21c5b683b400bd02ef6e10c3c9af1d900e724737a43f33cbe13db542b0211018317be428 +EBUILD hiredis-1.2.0.ebuild 2236 BLAKE2B 2072d84940ca93befdcf9907d2e9cf55d20c0bbbd887de5e6cee09640bad65d3479270aac89e416f2e7311c786bbf395bec6be1687d0df6e02473167757a26fc SHA512 1ddc2e6d1fb59d11d381b404b04b3366509dc27343b31268a076a89d93be6005b4b64d5fd3f9290749f7fe70475902ef93f025ac49b2ab05ab95f858fb37c338 MISC metadata.xml 404 BLAKE2B 3872a9946b2a134a1c55c2b0aa6a77d83df6b3e48a6bfd017e716ec0eb8400bc95476088d8b79de5e23d6638397b5a0d41bff556c076e607a6f1d0dcd668c7e5 SHA512 ea90d8e7a04ab8929bbefce3c78adb610c7e22d2c9ed44483e16dd4530f04baf160d372999a5de9ea52850336b4d9ca13fd70fb719c2db18f938360262761a29 diff --git a/dev-libs/hiredis/files/hiredis-1.2.0-conditional-werror.patch b/dev-libs/hiredis/files/hiredis-1.2.0-conditional-werror.patch new file mode 100644 index 000000000000..2ab7cf86e089 --- /dev/null +++ b/dev-libs/hiredis/files/hiredis-1.2.0-conditional-werror.patch @@ -0,0 +1,24 @@ +From bff171c9fc83f8abed9a283a3da2dc91a5671419 Mon Sep 17 00:00:00 2001 +From: Romain Geissler <romain.geissler@amadeus.com> +Date: Thu, 13 Jul 2023 12:39:45 +0000 +Subject: [PATCH] Allow disabling the -Werror flag. + +Upstream-commit: https://github.com/redis/hiredis/commit/bff171c9fc83f8abed9a283a3da2dc91a5671419 + +diff --git a/Makefile b/Makefile +index bd2106b1d..56e3d59be 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,7 +39,11 @@ export REDIS_TEST_CONFIG + CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') + CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++') + OPTIMIZATION?=-O3 +-WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers ++WARNINGS=-Wall -Wextra -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers ++USE_WERROR?=1 ++ifeq ($(USE_WERROR),1) ++ WARNINGS+=-Werror ++endif + DEBUG_FLAGS?= -g -ggdb + REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS) + REAL_LDFLAGS=$(LDFLAGS) diff --git a/dev-libs/hiredis/hiredis-1.1.0-r1.ebuild b/dev-libs/hiredis/hiredis-1.1.0-r1.ebuild index 085db7b29585..3359fd46452f 100644 --- a/dev-libs/hiredis/hiredis-1.1.0-r1.ebuild +++ b/dev-libs/hiredis/hiredis-1.1.0-r1.ebuild @@ -13,7 +13,7 @@ LICENSE="BSD" # Always check "Upgrading from ..." in README # e.g. https://github.com/redis/hiredis#upgrading-to-110 SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris" IUSE="examples ssl static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/hiredis/hiredis-1.2.0.ebuild b/dev-libs/hiredis/hiredis-1.2.0.ebuild index 6c1b7be7b083..10071f0716a4 100644 --- a/dev-libs/hiredis/hiredis-1.2.0.ebuild +++ b/dev-libs/hiredis/hiredis-1.2.0.ebuild @@ -28,19 +28,22 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.1.0-disable-network-tests.patch + "${FILESDIR}"/${PN}-1.2.0-conditional-werror.patch # bug 930336 ) _build() { - emake \ - AR="$(tc-getAR)" \ - CC="$(tc-getCC)" \ - PREFIX="${EPREFIX}/usr" \ - LIBRARY_PATH="$(get_libdir)" \ - USE_SSL=$(usex ssl 1 0) \ - TEST_ASYNC=$(usex test 1 0) \ - DEBUG_FLAGS= \ - OPTIMIZATION= \ - "$@" + local myconf=( + AR="$(tc-getAR)" + CC="$(tc-getCC)" + PREFIX="${EPREFIX}/usr" + LIBRARY_PATH="$(get_libdir)" + USE_SSL=$(usex ssl 1 0) + TEST_ASYNC=$(usex test 1 0) + DEBUG_FLAGS= + OPTIMIZATION= + USE_WERROR=0 + ) + emake "${myconf[@]}" "$@" } src_compile() { |