diff options
Diffstat (limited to 'dev-php/pecl-memcache')
-rw-r--r-- | dev-php/pecl-memcache/Manifest | 5 | ||||
-rw-r--r-- | dev-php/pecl-memcache/files/3.0.8-c99-inline.patch | 85 | ||||
-rw-r--r-- | dev-php/pecl-memcache/metadata.xml | 8 | ||||
-rw-r--r-- | dev-php/pecl-memcache/pecl-memcache-3.0.8-r2.ebuild | 47 | ||||
-rw-r--r-- | dev-php/pecl-memcache/pecl-memcache-3.0.8-r3.ebuild | 46 |
5 files changed, 191 insertions, 0 deletions
diff --git a/dev-php/pecl-memcache/Manifest b/dev-php/pecl-memcache/Manifest new file mode 100644 index 000000000000..d3f0ac5ea213 --- /dev/null +++ b/dev-php/pecl-memcache/Manifest @@ -0,0 +1,5 @@ +AUX 3.0.8-c99-inline.patch 3162 BLAKE2B 4f7fbd8f93a4388f907c342009abe691444d25f585bd592c37a76e2051dc9e0ef84cba882184945fb01037f3f27c3e708db308931be00cc1a92c218b38c25e56 SHA512 3b066a1e9277b6b4553a62970ba4f41a3bf02131db7ff5f897956e9764c29633872626dfb1f0651a09fb7282d5487d9536df0d36800e6f5ab9905d4ca6b2b2b5 +DIST memcache-3.0.8.tgz 70523 BLAKE2B 829c842ac2764327037c5ef620cd4759e16d56e22195c035eeed2722d8a499119489d3304ad5223cf1c89a8e3ab6f6830d67742958ec2a37e302bf8ea265dfb1 SHA512 916c6b21ab7c1021128626c0df35ef0b83cb76b6115fe7c45b003ca4f78ad9484bf3c998bc7ebdee19f84349ff1e56759f74e75aee5bc70b1de9a03c45a99bc3 +EBUILD pecl-memcache-3.0.8-r2.ebuild 1398 BLAKE2B 4a45e7aebad2959946f9e7d795e53c2b1f71bdf2fc43ca4d253943aec90c04820d4dcb587fdba24a3f4b239b39065617db16cc3a88aeeffe51924d14521d230d SHA512 4265b0f10d51bb484774d3aefe16196e333bba4448705aec7d46cde66aef5a2d45fd183fd7d6cb8e1fcb9cede4a4b79762365097e604d827b32844f3937acd13 +EBUILD pecl-memcache-3.0.8-r3.ebuild 1355 BLAKE2B 7ae3e333f2de1f20abff63e31d2d47569545bf747cfdb42d3770f0ff25328d91760014ade79436071ad9c6637902e89de3b089946d3db15692b37578736c395f SHA512 dabcb52a6d7263a7b89e4910ebc23c38078692a999f0ff7bbe93063a1b40020efb07c13c3446158b6123464b97da22df6860b3646aed0f140ac6e15b699411e3 +MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-memcache/files/3.0.8-c99-inline.patch b/dev-php/pecl-memcache/files/3.0.8-c99-inline.patch new file mode 100644 index 000000000000..818b3ce1e2d9 --- /dev/null +++ b/dev-php/pecl-memcache/files/3.0.8-c99-inline.patch @@ -0,0 +1,85 @@ +diff -aurN a/memcache_pool.h b/memcache_pool.h +--- a/memcache_pool.h 2013-04-07 22:12:54.000000000 -0400 ++++ b/memcache_pool.h 2017-05-19 16:04:45.262858090 -0400 +@@ -135,8 +135,14 @@ + #define mmc_buffer_release(b) memset((b), 0, sizeof(*(b))) + #define mmc_buffer_reset(b) (b)->value.len = (b)->idx = 0 + +-inline void mmc_buffer_alloc(mmc_buffer_t *, unsigned int); +-inline void mmc_buffer_free(mmc_buffer_t *); ++#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L ++#define MMC_POOL_INLINE inline ++#else ++#define MMC_POOL_INLINE __attribute__ ((gnu_inline)) inline ++#endif ++ ++MMC_POOL_INLINE void mmc_buffer_alloc(mmc_buffer_t *, unsigned int); ++MMC_POOL_INLINE void mmc_buffer_free(mmc_buffer_t *); + + /* stream handlers */ + typedef struct mmc_stream mmc_stream_t; +@@ -391,8 +397,8 @@ + double timeval_to_double(struct timeval tv); + struct timeval double_to_timeval(double sec); + +-inline int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *); +-inline int mmc_prepare_key(zval *, char *, unsigned int *); ++MMC_POOL_INLINE int mmc_prepare_key_ex(const char *, unsigned int, char *, unsigned int *); ++MMC_POOL_INLINE int mmc_prepare_key(zval *, char *, unsigned int *); + + #define mmc_str_left(h, n, hlen, nlen) ((hlen) >= (nlen) ? memcmp((h), (n), (nlen)) == 0 : 0) + +diff -aurN a/memcache_queue.h b/memcache_queue.h +--- a/memcache_queue.h 2013-04-07 22:12:54.000000000 -0400 ++++ b/memcache_queue.h 2017-05-19 16:07:23.753983941 -0400 +@@ -40,7 +40,11 @@ + #ifdef PHP_WIN32 + #define MMC_QUEUE_INLINE + #else ++#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L + #define MMC_QUEUE_INLINE inline ++#else ++#define MMC_QUEUE_INLINE __attribute__ ((gnu_inline)) inline ++#endif + #endif + + MMC_QUEUE_INLINE void mmc_queue_push(mmc_queue_t *, void *); +diff -aurN a/memcache_pool.c b/memcache_pool.c +--- a/memcache_pool.c 2013-04-07 22:12:54.000000000 -0400 ++++ b/memcache_pool.c 2017-05-19 16:22:51.592845885 -0400 +@@ -40,7 +40,7 @@ + + ZEND_DECLARE_MODULE_GLOBALS(memcache) + +-inline void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size) /* ++MMC_POOL_INLINE void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size) /* + ensures space for an additional size bytes {{{ */ + { + register size_t newlen; +@@ -48,7 +48,7 @@ + } + /* }}} */ + +-inline void mmc_buffer_free(mmc_buffer_t *buffer) /* {{{ */ ++MMC_POOL_INLINE void mmc_buffer_free(mmc_buffer_t *buffer) /* {{{ */ + { + if (buffer->value.c != NULL) { + smart_str_free(&(buffer->value)); +@@ -1676,7 +1676,7 @@ + } + /* }}} */ + +-inline int mmc_prepare_key_ex(const char *key, unsigned int key_len, char *result, unsigned int *result_len) /* {{{ */ ++MMC_POOL_INLINE int mmc_prepare_key_ex(const char *key, unsigned int key_len, char *result, unsigned int *result_len) /* {{{ */ + { + unsigned int i; + if (key_len == 0) { +@@ -1694,7 +1694,7 @@ + } + /* }}} */ + +-inline int mmc_prepare_key(zval *key, char *result, unsigned int *result_len) /* {{{ */ ++MMC_POOL_INLINE int mmc_prepare_key(zval *key, char *result, unsigned int *result_len) /* {{{ */ + { + if (Z_TYPE_P(key) == IS_STRING) { + return mmc_prepare_key_ex(Z_STRVAL_P(key), Z_STRLEN_P(key), result, result_len); diff --git a/dev-php/pecl-memcache/metadata.xml b/dev-php/pecl-memcache/metadata.xml new file mode 100644 index 000000000000..b86acf66c756 --- /dev/null +++ b/dev-php/pecl-memcache/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>php-bugs@gentoo.org</email> + <name>PHP</name> + </maintainer> +</pkgmetadata> diff --git a/dev-php/pecl-memcache/pecl-memcache-3.0.8-r2.ebuild b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r2.ebuild new file mode 100644 index 000000000000..e35e5048a992 --- /dev/null +++ b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PHP_EXT_NAME="memcache" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +DOCS=( README ) + +USE_PHP="php5-6" + +inherit php-ext-pecl-r3 flag-o-matic + +KEYWORDS="amd64 hppa ppc64 x86" + +DESCRIPTION="PHP extension for using memcached" +LICENSE="PHP-3" +SLOT="0" +IUSE="+session" + +DEPEND="sys-libs/zlib + dev-lang/php:5.6[session?]" +RDEPEND="${DEPEND}" + +# The test suite requires memcached to be running. +RESTRICT='test' + +src_configure() { + # fix bug 618920 by restoring pre-GCC5 inline semantics + append-cflags -std=gnu89 + local PHP_EXT_ECONF_ARGS=( --enable-memcache --with-zlib-dir=/usr $(use_enable session memcache-session) ) + php-ext-source-r3_src_configure +} + +src_install() { + php-ext-pecl-r3_src_install + + php-ext-source-r3_addtoinifiles "memcache.allow_failover" "true" + php-ext-source-r3_addtoinifiles "memcache.max_failover_attempts" "20" + php-ext-source-r3_addtoinifiles "memcache.chunk_size" "32768" + php-ext-source-r3_addtoinifiles "memcache.default_port" "11211" + php-ext-source-r3_addtoinifiles "memcache.hash_strategy" "consistent" + php-ext-source-r3_addtoinifiles "memcache.hash_function" "crc32" + php-ext-source-r3_addtoinifiles "memcache.redundancy" "1" + php-ext-source-r3_addtoinifiles "memcache.session_redundancy" "2" + php-ext-source-r3_addtoinifiles "memcache.protocol" "ascii" +} diff --git a/dev-php/pecl-memcache/pecl-memcache-3.0.8-r3.ebuild b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r3.ebuild new file mode 100644 index 000000000000..2712c682f647 --- /dev/null +++ b/dev-php/pecl-memcache/pecl-memcache-3.0.8-r3.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PHP_EXT_NAME="memcache" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +DOCS=( README ) +PATCHES=( "${FILESDIR}/3.0.8-c99-inline.patch" ) + +USE_PHP="php5-6" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~hppa ~ppc64 ~x86" + +DESCRIPTION="PHP extension for using memcached" +LICENSE="PHP-3" +SLOT="0" +IUSE="+session" + +DEPEND="sys-libs/zlib + dev-lang/php:5.6[session?]" +RDEPEND="${DEPEND}" + +# The test suite requires memcached to be running. +RESTRICT='test' + +src_configure() { + local PHP_EXT_ECONF_ARGS=( --enable-memcache --with-zlib-dir=/usr $(use_enable session memcache-session) ) + php-ext-source-r3_src_configure +} + +src_install() { + php-ext-pecl-r3_src_install + + php-ext-source-r3_addtoinifiles "memcache.allow_failover" "true" + php-ext-source-r3_addtoinifiles "memcache.max_failover_attempts" "20" + php-ext-source-r3_addtoinifiles "memcache.chunk_size" "32768" + php-ext-source-r3_addtoinifiles "memcache.default_port" "11211" + php-ext-source-r3_addtoinifiles "memcache.hash_strategy" "consistent" + php-ext-source-r3_addtoinifiles "memcache.hash_function" "crc32" + php-ext-source-r3_addtoinifiles "memcache.redundancy" "1" + php-ext-source-r3_addtoinifiles "memcache.session_redundancy" "2" + php-ext-source-r3_addtoinifiles "memcache.protocol" "ascii" +} |