snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

hiredis: update to 1.1.0.

This commit is contained in:
Evgeny Ermakov 2022-11-06 19:07:41 +11:00 committed by Toyam Cox
parent 981c67695b
commit 8496c03be2
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/shlibs
View File

@ -2375,7 +2375,7 @@ libtidy.so.58 libtidy5-5.8.0_1
libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1 libSDL2_gfx-1.0.so.0 SDL2_gfx-1.0.1_1
libinjeqt.so.1 injeqt-1.1.0_1 libinjeqt.so.1 injeqt-1.1.0_1
libgadu.so.3 libgadu-1.12.1_1 libgadu.so.3 libgadu-1.12.1_1
libhiredis.so.1.0.0 hiredis-1.0.0_1 libhiredis.so.1.1.0 hiredis-1.1.0_1
libIL.so.1 devil-1.7.8_1 libIL.so.1 devil-1.7.8_1
libILU.so.1 devil-1.7.8_1 libILU.so.1 devil-1.7.8_1
libILUT.so.1 devil-1.7.8_1 libILUT.so.1 devil-1.7.8_1

6
srcpkgs/hiredis/patches/fix-cflags.patch
View File

@ -2,7 +2,7 @@ Index: Makefile
=================================================================== ===================================================================
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -44,9 +44,9 @@ export REDIS_TEST_CONFIG @@ -44,8 +44,8 @@ export REDIS_TEST_CONFIG
# Fallback to gcc when $CC is not in $PATH. # Fallback to gcc when $CC is not in $PATH.
CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc') 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++') CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
@ -11,6 +11,6 @@ Index: Makefile
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
-DEBUG_FLAGS?= -g -ggdb -DEBUG_FLAGS?= -g -ggdb
+DEBUG_FLAGS?= +DEBUG_FLAGS?=
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
REAL_LDFLAGS=$(LDFLAGS) REAL_LDFLAGS=$(LDFLAGS)

16
srcpkgs/hiredis/patches/fix-pkgconfig.patch
View File

@ -2,25 +2,29 @@ Index: Makefile
=================================================================== ===================================================================
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -234,8 +234,8 @@ $(PKGCONFNAME): hiredis.h @@ -234,9 +234,9 @@ $(PKGCONFNAME): hiredis.h
@echo "Generating $@ for pkgconfig..." @echo "Generating $@ for pkgconfig..."
@echo prefix=$(PREFIX) > $@ @echo prefix=$(PREFIX) > $@
@echo exec_prefix=\$${prefix} >> $@ @echo exec_prefix=\$${prefix} >> $@
- @echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@ - @echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
- @echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ - @echo includedir=$(PREFIX)/include >> $@
+ @echo libdir=\$${prefix}/$(LIBRARY_PATH) >> $@ + @echo libdir=\$${prefix}/$(LIBRARY_PATH) >> $@
+ @echo includedir=\$${prefix}/$(INCLUDE_PATH) >> $@ + @echo includedir=\$${prefix}/include >> $@
- @echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
+ @echo pkgincludedir=\$${prefix}/$(INCLUDE_PATH) >> $@
@echo >> $@ @echo >> $@
@echo Name: hiredis >> $@ @echo Name: hiredis >> $@
@echo Description: Minimalistic C client library for Redis. >> $@ @echo Description: Minimalistic C client library for Redis. >> $@
@@ -247,8 +247,8 @@ $(SSL_PKGCONFNAME): hiredis_ssl.h @@ -247,9 +247,9 @@ $(SSL_PKGCONFNAME): hiredis_ssl.h
@echo "Generating $@ for pkgconfig..." @echo "Generating $@ for pkgconfig..."
@echo prefix=$(PREFIX) > $@ @echo prefix=$(PREFIX) > $@
@echo exec_prefix=\$${prefix} >> $@ @echo exec_prefix=\$${prefix} >> $@
- @echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@ - @echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@
- @echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ - @echo includedir=$(PREFIX)/include >> $@
+ @echo libdir=\$${prefix}/$(LIBRARY_PATH) >> $@ + @echo libdir=\$${prefix}/$(LIBRARY_PATH) >> $@
+ @echo includedir=\$${prefix}/$(INCLUDE_PATH) >> $@ + @echo includedir=\$${prefix}/include >> $@
- @echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@
+ @echo pkgincludedir=\$${prefix}/$(INCLUDE_PATH) >> $@
@echo >> $@ @echo >> $@
@echo Name: hiredis_ssl >> $@ @echo Name: hiredis_ssl >> $@
@echo Description: SSL Support for hiredis. >> $@ @echo Description: SSL Support for hiredis. >> $@

6
srcpkgs/hiredis/template
View File

@ -1,7 +1,7 @@
# Template file for 'hiredis' # Template file for 'hiredis'
pkgname=hiredis pkgname=hiredis
version=1.0.0 version=1.1.0
revision=2 revision=1
build_style=gnu-makefile build_style=gnu-makefile
checkdepends="redis" checkdepends="redis"
short_desc="Minimalistic C client for Redis" short_desc="Minimalistic C client for Redis"
@ -9,7 +9,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause" license="BSD-3-Clause"
homepage="https://github.com/redis/hiredis" homepage="https://github.com/redis/hiredis"
distfiles="https://github.com/redis/hiredis/archive/v${version}.tar.gz" distfiles="https://github.com/redis/hiredis/archive/v${version}.tar.gz"
checksum=2a0b5fe5119ec973a0c1966bfc4bd7ed39dbce1cb6d749064af9121fe971936f checksum=fe6d21741ec7f3fc9df409d921f47dfc73a4d8ff64f4ac6f1d95f951bf7f53d6
post_install() { post_install() {
vlicense COPYING vlicense COPYING