Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/php-5_2/php-nsapi/patches/01_php_nsapi_divert.patch
author Petr Nyc <Petr.Nyc@Oracle.COM>
Fri, 27 Mar 2015 13:24:00 +0100
branchs11u2-sru
changeset 4027 a2e597105018
parent 673 bb9df3c906be
permissions -rw-r--r--
Removed tag 0.175.2..0..0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
673
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     1
 
--- php-5.2.17/configure.in.orig	Thu Jan 19 05:56:12 2012
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     2
 
+++ php-5.2.17/configure.in	Thu Jan 19 05:56:27 2012
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     3
 
@@ -1,7 +1,6 @@
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     4
 
 ## $Id: configure.in 307193 2011-01-06 23:01:19Z iliaa $ -*- autoconf -*-
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     5
 
 dnl ## Process this file with autoconf to produce a configure script.
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     6
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     7
 
-divert(1)
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     8
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
     9
 
 dnl ## Diversion 1 is the autoconf + automake setup phase. We also
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    10
 
 dnl ## set the PHP version, deal with platform-specific compile
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    11
 
@@ -256,7 +255,6 @@
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    12
 
 sinclude(TSRM/tsrm.m4)
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    13
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    14
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    15
 
-divert(2)
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    16
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    17
 
 dnl ## Diversion 2 is where we set PHP-specific options and come up
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    18
 
 dnl ## with reasonable default values for them. We check for pthreads here
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    19
 
@@ -295,7 +293,6 @@
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    20
 
   PTHREADS_FLAGS
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    21
 
 fi
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    22
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    23
 
-divert(3)
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    24
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    25
 
 dnl ## In diversion 3 we check for compile-time options to the PHP
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    26
 
 dnl ## core and how to deal with different system dependencies.
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    27
 
@@ -655,7 +652,6 @@
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    28
 
   PHP_CRYPT_R_STYLE
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    29
 
 fi
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    30
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    31
 
-divert(4)
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    32
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    33
 
 dnl ## In diversion 4 we check user-configurable general settings.
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    34
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    35
 
@@ -913,7 +909,6 @@
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    36
 
   AC_MSG_RESULT([using system default])
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    37
 
 fi
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    38
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    39
 
-divert(5)
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    40
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    41
 
 dnl ## In diversion 5 we check which extensions should be compiled.
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    42
 
 dnl ## All of these are normally in the extension directories.
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    43
 
--- php-5.2.17/ext/standard/config.m4.orig	Thu Jan 19 05:57:19 2012
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    44
 
+++ php-5.2.17/ext/standard/config.m4	Thu Jan 19 05:59:05 2012
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    45
 
@@ -1,6 +1,5 @@
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    46
 
 dnl $Id: config.m4 291364 2009-11-27 23:41:13Z rasmus $ -*- autoconf -*-
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    47
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    48
 
-divert(3)dnl
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    49
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    50
 
 dnl
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    51
 
 dnl Check if flush should be called explicitly after buffered io
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    52
 
@@ -205,7 +204,6 @@
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    53
 
 AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    54
 
 AC_FUNC_FNMATCH
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    55
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    56
 
-divert(5)dnl
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    57
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    58
 
 dnl
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    59
 
 dnl Check for regex library type
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    60
 
--- php-5.2.17/scripts/phpize.m4.orig	Thu Jan 19 05:57:11 2012
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    61
 
+++ php-5.2.17/scripts/phpize.m4	Thu Jan 19 05:58:52 2012
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    62
 
@@ -1,6 +1,5 @@
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    63
 
 dnl This file becomes configure.in for self-contained extensions.
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    64
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    65
 
-divert(1)
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    66
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    67
 
 AC_PREREQ(2.13)
bb9df3c906be PSARC 2012/033 automake 1.11.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff changeset 
    68
 
 AC_INIT(config.m4)
upstream/oracle/userland-gate