diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-03-28 08:29:51 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-03-28 08:29:51 +0100 |
| commit | 550527031eabea15edda7d42e2587e8ae1955213 (patch) | |
| tree | 8b74034b808c06613bacfeac8e08e778705781d7 /uuid-build.patch | |
| parent | 60792b1816a15c41395ca0357f53a1e9ebae2afc (diff) | |
php-pecl-uuid: add fix for PHP 7
Diffstat (limited to 'uuid-build.patch')
| -rw-r--r-- | uuid-build.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/uuid-build.patch b/uuid-build.patch index c1b0f7e..db6a999 100644 --- a/uuid-build.patch +++ b/uuid-build.patch @@ -9,3 +9,38 @@ uuid_type); uuid_generate(uuid); break; +--- pecl/uuid/trunk/config.m4 2015/03/28 06:45:58 336225 ++++ pecl/uuid/trunk/config.m4 2015/03/28 07:05:04 336226 +@@ -6,18 +6,28 @@ + + + if test "$PHP_UUID" != "no"; then +- PHP_CHECK_FUNC_LIB(uuid_type, uuid) +- PHP_CHECK_FUNC_LIB(uuid_variant, uuid) +- + ++ AC_MSG_CHECKING([for the location of libuuid]) ++ for dir in $PHP_UUID /usr/local /usr; do ++ if test -f "$dir/include/uuid/uuid.h"; then ++ PHP_UUID_DIR="$dir" ++ fi ++ done ++ if test -z "$PHP_UUID_DIR"; then ++ AC_MSG_ERROR(not found) ++ else ++ AC_MSG_RESULT(found in $PHP_UUID_DIR) ++ fi + PHP_ADD_INCLUDE($PHP_UUID_DIR/include) ++ PHP_CHECK_FUNC_LIB(uuid_type, uuid) ++ PHP_CHECK_FUNC_LIB(uuid_variant, uuid) + + export OLD_CPPFLAGS="$CPPFLAGS" + export CPPFLAGS="$CPPFLAGS $INCLUDES -DHAVE_UUID" + AC_CHECK_HEADER([uuid/uuid.h], [], AC_MSG_ERROR('uuid/uuid.h' header not found)) + PHP_SUBST(UUID_SHARED_LIBADD) + +- PHP_ADD_LIBRARY_WITH_PATH(uuid, $PHP_UUID_DIR/lib, UUID_SHARED_LIBADD) ++ PHP_ADD_LIBRARY_WITH_PATH(uuid, $PHP_UUID_DIR/$PHP_LIBDIR, UUID_SHARED_LIBADD) + export CPPFLAGS="$OLD_CPPFLAGS" + + export OLD_CPPFLAGS="$CPPFLAGS" |