X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=pcre-shared.patch.diff;fp=pcre-shared.patch.diff;h=0000000000000000000000000000000000000000;hb=72ad6add086b462795ce6d3a9a6ca5f8d8410b03;hp=27c6ed0d5ead48e69c5a14284aadd431f001d513;hpb=ad5f98910c721925df50d505bbf45b82b90eaf38;p=packages%2Fphp.git

diff --git a/pcre-shared.patch.diff b/pcre-shared.patch.diff
deleted file mode 100644
index 27c6ed0..0000000
--- a/pcre-shared.patch.diff
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/pcre-shared.patch b/pcre-shared.patch
-index 39632a0..81b9ecf 100644
---- a/pcre-shared.patch
-+++ b/pcre-shared.patch
-@@ -1,48 +1,3 @@
----- php-5.3.1/ext/pcre/config0.m4	2009-11-27 08:19:08.836025192 +0000
--+++ php-5.3.1/ext/pcre/config0.m4	2009-11-30 22:09:24.385647500 +0000
--@@ -11,7 +11,7 @@
-- 
--   if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
--     AC_MSG_CHECKING([for PCRE headers location])
---    for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do
--+    for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include /usr/include; do
--       test -f $i/pcre.h && PCRE_INCDIR=$i
--     done
-- 
--@@ -21,7 +21,7 @@
--     AC_MSG_RESULT([$PCRE_INCDIR])
-- 
--     AC_MSG_CHECKING([for PCRE library location])
---    for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
--+    for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR /usr/$PHP_LIBDIR; do
--       test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
--     done
--     
--@@ -43,12 +43,13 @@
--       AC_MSG_ERROR([The PCRE extension requires PCRE library version >= 6.6])
--     fi
-- 
---    PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR)
--+    PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD)
--     
--     AC_DEFINE(HAVE_PCRE, 1, [ ])
--     PHP_ADD_INCLUDE($PCRE_INCDIR)
---    PHP_NEW_EXTENSION(pcre, php_pcre.c, no)
--+    PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared)
--     PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h])
--+    EXTRA_LIBS="$EXTRA_LIBS -lpcre"
--   else
--     AC_MSG_CHECKING([for PCRE library to use])
--     AC_MSG_RESULT([bundled])
--@@ -59,7 +60,7 @@
--     				 pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c \
--     				 pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c \
--     				 pcrelib/pcre_version.c pcrelib/pcre_xclass.c"
---    PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, no,,-I@ext_srcdir@/pcrelib)
--+    PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, $ext_shared,,-I@ext_srcdir@/pcrelib)
--     PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
--     PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
--     AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
- --- php-5.3.1/ext/pcre/php_pcre.h	2009-11-30 20:59:04.046581246 +0200
- +++ php-5.3.1.pcre/ext/pcre/php_pcre.h	2009-11-30 21:38:06.435493243 +0000
- @@ -34,7 +34,12 @@
-@@ -116,3 +71,48 @@
-  
-  [Zend Modules]
-  %aDone
-+--- php-5.3.24/ext/pcre/config0.m4.orig	2013-04-10 09:42:48.000000000 +0200
-++++ php-5.3.24/ext/pcre/config0.m4	2013-04-12 18:54:41.113531049 +0200
-+@@ -11,7 +11,7 @@
-+ 
-+   if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
-+     AC_MSG_CHECKING([for PCRE headers location])
-+-    for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do
-++    for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include /usr/include; do
-+       test -f $i/pcre.h && PCRE_INCDIR=$i
-+     done
-+ 
-+@@ -21,7 +21,7 @@
-+     AC_MSG_RESULT([$PCRE_INCDIR])
-+ 
-+     AC_MSG_CHECKING([for PCRE library location])
-+-    for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
-++    for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR /usr/$PHP_LIBDIR; do
-+       test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
-+     done
-+     
-+@@ -43,12 +43,13 @@
-+       AC_MSG_ERROR([The PCRE extension requires PCRE library version >= 6.6])
-+     fi
-+ 
-+-    PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR)
-++    PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD)
-+     
-+     AC_DEFINE(HAVE_PCRE, 1, [ ])
-+     PHP_ADD_INCLUDE($PCRE_INCDIR)
-+-    PHP_NEW_EXTENSION(pcre, php_pcre.c, no)
-++    PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared)
-+     PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h])
-++    EXTRA_LIBS="$EXTRA_LIBS -lpcre"
-+   else
-+     AC_MSG_CHECKING([for PCRE library to use])
-+     AC_MSG_RESULT([bundled])
-+@@ -60,7 +61,7 @@
-+     				 pcrelib/pcre_tables.c pcrelib/pcre_valid_utf8.c \
-+     				 pcrelib/pcre_version.c pcrelib/pcre_xclass.c"
-+     PHP_PCRE_CFLAGS="-DHAVE_CONFIG_H -I@ext_srcdir@/pcrelib"
-+-    PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, no,,$PHP_PCRE_CFLAGS)
-++    PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, $ext_shared,,-I@ext_srcdir@/pcrelib)
-+     PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
-+     PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
-+     AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])