diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-08-29 14:26:44 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-08-29 14:26:44 +0400 |
| commit | 39d73c860d87a6b610e598d26e1bcd96433d22e2 (patch) | |
| tree | 7df8ef525974ba86e56b505a4a8dcca106b5c63f | |
| parent | 1a899e9a2aaa8a6a6eb38bc6d5c0497b61fb7d8a (diff) | |
| download | php-39d73c860d87a6b610e598d26e1bcd96433d22e2.tar.gz | |
Fixed building the "hash" extension (dyson-hash.patch)
| -rw-r--r-- | debian/patches/dyson-hash.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/debian/patches/dyson-hash.patch b/debian/patches/dyson-hash.patch new file mode 100644 index 000000000..87fad017b --- /dev/null +++ b/debian/patches/dyson-hash.patch @@ -0,0 +1,15 @@ +Index: php/ext/hash/hash_ripemd.c +=================================================================== +--- php.orig/ext/hash/hash_ripemd.c ++++ php/ext/hash/hash_ripemd.c +@@ -172,6 +172,10 @@ static const unsigned char S[80] = { + 11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12, + 9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6 }; + ++/* defined at illumos */ ++#ifdef SS ++#undef SS ++#endif + static const unsigned char SS[80] = { + 8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6, + 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11, diff --git a/debian/patches/series b/debian/patches/series index 2930711ae..521bfcd5f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -47,3 +47,4 @@ hack-phpdbg-to-explicitly-link-with-libedit.patch php-fpm-getallheaders.patch 0001-Fix-ZEND_MM_ALIGNMENT-on-m64k.patch dyson-date.patch +dyson-hash.patch |