diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-libs/hiredis | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-libs/hiredis')
| -rw-r--r-- | dev-libs/hiredis/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch | 11 | ||||
| -rw-r--r-- | dev-libs/hiredis/hiredis-0.14.1.ebuild | 10 |
3 files changed, 19 insertions, 5 deletions
diff --git a/dev-libs/hiredis/Manifest b/dev-libs/hiredis/Manifest index f51b6dce4581..f1d8ad847b6a 100644 --- a/dev-libs/hiredis/Manifest +++ b/dev-libs/hiredis/Manifest @@ -1,4 +1,5 @@ AUX hiredis-0.13.3-disable-network-tests.patch 1297 BLAKE2B 49b87fc28763d551c51524941dd8254765569546997dea69d427473799fe4921b96013cff79a9c09af3341bee848274a5b2281c16785fd44592ebbec866c6978 SHA512 bfbf4ee0a6780cbdcac4c8578aacac241d2b00c94dedd4f298ff06d65cab100f446072573ea0b57a513d3f7146070776fa08e949374e43272c2b05e601f250fc +AUX hiredis-0.14.1-honor-AR.patch 441 BLAKE2B efbb4c544b6418f689789c2c4147bf45e6b7385718898c4091b2bdf79f409fb34b1499b3af6ad903f524d6dbe96dcb90e404f6b2c33d03e4a2cd829bea18adb8 SHA512 ac6ddda51071918234cf3b79c4df094ec14c5eeecc35f4cabb2c5b6549089db704f7a69585a9bb21c95b72b203010f75c23252e80663381502663d76538f3820 DIST hiredis-0.14.1.tar.gz 64372 BLAKE2B 9846b05e21bfadb876e26ab45bf5c29a3283b602ef725dfbd877815be690bb5579551f0c452e1d8abf9ae985f6b71408a3b86b343ca5d6dce58dd4897640996a SHA512 a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f -EBUILD hiredis-0.14.1.ebuild 1869 BLAKE2B baed0625ddf7cf07ffe0bbc4f4d1a033a196ad1896c7d175902e798cf20ae8a933efe502465af5a35ad5268f4716824a39432102c6dd85adaf631d46226c5878 SHA512 29f5812ba5bb3806974b50b83a10bbc7392b64e9a879209b3eae4bb23f0019ba2bfaf6d472ece0fe59c3a88dfb4d83810019395d2191193a10453a1e52f301a6 +EBUILD hiredis-0.14.1.ebuild 1899 BLAKE2B 36cf0eae92dc3cfed0979be6ce3b46d2d582fd944fcb40fa0e34cb855e9dd63acccd0cdb7b5af33147a8984a8d168e821283054ef07babbebaac7973d2040960 SHA512 1db9c4fd111f6763728fd0594e042e9e074c4f28294c0c3b724052b701dab642469c9e6a0480bee2ff56faacb6b5cb0cc0f1d91681842f4ff51937893f1f03a8 MISC metadata.xml 324 BLAKE2B 4b317777c17533d9f574064a410d1431dde5ac68fe50b25140f63cd21829b30cede1a4e3d38996eb50de1cc38257a9e5eabb2c2871c1d5727132a698048de93e SHA512 5c81a7e5c915ae46f6d2849806534ee520d413f8ca2f640c7441a61a478652bdc6f0a2501504843b1f07b557c06c0045e92ee87a949e018f7d95884e38faf78c diff --git a/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch b/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch new file mode 100644 index 000000000000..0bfcf0988e81 --- /dev/null +++ b/dev-libs/hiredis/files/hiredis-0.14.1-honor-AR.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -51,7 +51,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR) + DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX) + DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) + STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) +-STLIB_MAKE_CMD=ar rcs $(STLIBNAME) ++STLIB_MAKE_CMD=$(AR) rcs $(STLIBNAME) + + # Platform-specific overrides + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') diff --git a/dev-libs/hiredis/hiredis-0.14.1.ebuild b/dev-libs/hiredis/hiredis-0.14.1.ebuild index 9028b420d2de..b0bf2fbfaedb 100644 --- a/dev-libs/hiredis/hiredis-0.14.1.ebuild +++ b/dev-libs/hiredis/hiredis-0.14.1.ebuild @@ -18,7 +18,10 @@ RESTRICT="!test? ( test )" DEPEND="test? ( dev-db/redis )" src_prepare() { - local PATCHES=( "${FILESDIR}/${PN}-0.13.3-disable-network-tests.patch" ) + local PATCHES=( + "${FILESDIR}"/${PN}-0.13.3-disable-network-tests.patch + "${FILESDIR}"/${PN}-0.14.1-honor-AR.patch + ) default # use GNU ld syntax on Solaris @@ -31,9 +34,8 @@ _build() { CC="$(tc-getCC)" \ PREFIX="${EPREFIX}/usr" \ LIBRARY_PATH="$(get_libdir)" \ - ARCH= \ - DEBUG= \ - OPTIMIZATION="${CPPFLAGS}" \ + DEBUG_FLAGS= \ + OPTIMIZATION= \ "$@" } |