diff options
Diffstat (limited to 'zip-systemlibzip.patch')
| -rw-r--r-- | zip-systemlibzip.patch | 116 |
1 files changed, 0 insertions, 116 deletions
diff --git a/zip-systemlibzip.patch b/zip-systemlibzip.patch deleted file mode 100644 index a8a4158..0000000 --- a/zip-systemlibzip.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 4265dac56d5c869163a66ceb85a07ebac4b46217 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Tue, 20 Aug 2013 15:17:57 +0200 -Subject: [PATCH] allow to build using system libzip 0.11 (using --with-libzip - option) - ---- - config.m4 | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - php_zip.c | 1 + - php_zip.h | 4 ++++ - 3 files changed, 58 insertions(+) - -diff --git a/config.m4 b/config.m4 -index aade73d..85b94cc 100755 ---- a/config.m4 -+++ b/config.m4 -@@ -13,8 +13,60 @@ fi - PHP_ARG_WITH(pcre-dir, pcre install prefix, - [ --with-pcre-dir ZIP: pcre install prefix], no, no) - -+PHP_ARG_WITH(libzip, libzip, -+[ --with-libzip[=DIR] ZIP: use libzip], no, no) -+ - if test "$PHP_ZIP" != "no"; then - -+ if test "$PHP_LIBZIP" != "no"; then -+ -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ -+ dnl system libzip, depends on libzip -+ AC_MSG_CHECKING(for libzip) -+ if test -r $PHP_LIBZIP/include/zip.h; then -+ LIBZIP_CFLAGS="-I$PHP_LIBZIP/include" -+ LIBZIP_LIBDIR="$PHP_LIBZIP/$PHP_LIBDIR" -+ AC_MSG_RESULT(from option: found in $PHP_LIBZIP) -+ -+ elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libzip; then -+ LIBZIP_CFLAGS=`$PKG_CONFIG libzip --cflags` -+ LIBZIP_LIBDIR=`$PKG_CONFIG libzip --variable=libdir` -+ AC_MSG_RESULT(from pkgconfig: found in $LIBZIP_LIBDIR) -+ -+ else -+ for i in /usr/local /usr; do -+ if test -r $i/include/zip.h; then -+ LIBZIP_CFLAGS="-I$i/include" -+ LIBZIP_LIBDIR="$i/$PHP_LIBDIR" -+ AC_MSG_RESULT(in default path: found in $i) -+ break -+ fi -+ done -+ fi -+ -+ if test -z "$LIBZIP_LIBDIR"; then -+ AC_MSG_RESULT(not found) -+ AC_MSG_ERROR(Please reinstall the libzip distribution) -+ fi -+ -+ dnl Could not think of a simple way to check libzip for overwrite support -+ PHP_CHECK_LIBRARY(zip, zip_open, -+ [ -+ PHP_ADD_LIBRARY_WITH_PATH(zip, $LIBZIP_LIBDIR, ZIP_SHARED_LIBADD) -+ AC_DEFINE(HAVE_LIBZIP,1,[ ]) -+ ], [ -+ AC_MSG_ERROR(could not find usable libzip) -+ ], [ -+ -L$LIBZIP_LIBDIR -+ ]) -+ -+ AC_DEFINE(HAVE_ZIP,1,[ ]) -+ PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c, $ext_shared,, $LIBZIP_CFLAGS) -+ PHP_SUBST(ZIP_SHARED_LIBADD) -+ else -+ -+ dnl bundled libzip, depends on zlib - if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then - if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then - PHP_ZLIB_DIR="$PHP_ZLIB_DIR" -@@ -70,6 +122,7 @@ if test "$PHP_ZIP" != "no"; then - PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared) - PHP_ADD_BUILD_DIR($ext_builddir/lib, 1) - PHP_SUBST(ZIP_SHARED_LIBADD) -+fi - - - AC_CHECK_TYPES([int8_t]) -diff --git a/php_zip.c b/php_zip.c -index 2e97e84..d8cf7f2 100755 ---- a/php_zip.c -+++ b/php_zip.c -@@ -30,6 +30,7 @@ - #include "ext/standard/php_string.h" - #include "ext/pcre/php_pcre.h" - #include "php_zip.h" -+/* Private struct definition, always use bundled copy */ - #include "lib/zipint.h" - - /* zip_open is a macro for renaming libzip zipopen, so we need to use PHP_NAMED_FUNCTION */ -diff --git a/php_zip.h b/php_zip.h -index d734284..deeb1b4 100755 ---- a/php_zip.h -+++ b/php_zip.h -@@ -28,7 +28,11 @@ - #include "TSRM.h" - #endif - -+#if defined(HAVE_LIBZIP) -+#include <zip.h> -+#else - #include "lib/zip.h" -+#endif - - #define PHP_ZIP_VERSION_STRING "1.12.1" - --- -1.8.1.6 - |