Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/php/patches/php-5.4.19-db6.patch

    Contents of /trunk/php/patches/php-5.4.19-db6.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2286 - (show annotations) (download)
    Thu Sep 19 13:16:34 2013 UTC (10 years, 7 months ago) by niro
    File size: 1888 byte(s) 
    -added patch for berkley db-6.0 support
    1 --- configure 2013-07-03 08:16:15.000000000 +0200
    2 +++ configure 2013-08-07 19:19:16.797273766 +0200
    3 @@ -42409,7 +42409,7 @@
    4 /* end confdefs.h. */
    5
    6 #include "$THIS_INCLUDE"
    7 -#if DB_VERSION_MAJOR == 4 || (4 == 4 && DB_VERSION_MAJOR == 5)
    8 +#if DB_VERSION_MAJOR == 4 || (4 == 4 && DB_VERSION_MAJOR >= 5)
    9 yes
    10 #endif
    11
    12 @@ -42785,7 +42785,7 @@
    13 /* end confdefs.h. */
    14
    15 #include "$THIS_INCLUDE"
    16 -#if DB_VERSION_MAJOR == 3 || (3 == 4 && DB_VERSION_MAJOR == 5)
    17 +#if DB_VERSION_MAJOR == 3 || (3 == 4 && DB_VERSION_MAJOR >= 5)
    18 yes
    19 #endif
    20
    21 @@ -43161,7 +43161,7 @@
    22 /* end confdefs.h. */
    23
    24 #include "$THIS_INCLUDE"
    25 -#if DB_VERSION_MAJOR == 2 || (2 == 4 && DB_VERSION_MAJOR == 5)
    26 +#if DB_VERSION_MAJOR == 2 || (2 == 4 && DB_VERSION_MAJOR >= 5)
    27 yes
    28 #endif
    29
    30 --- ext/dba/config.m4 2013-07-03 08:10:53.000000000 +0200
    31 +++ ext/dba/config.m4 2013-08-07 19:18:55.774448348 +0200
    32 @@ -245,7 +245,7 @@
    33 ],[
    34 AC_EGREP_CPP(yes,[
    35 #include "$THIS_INCLUDE"
    36 -#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR == 5)
    37 +#if DB_VERSION_MAJOR == $1 || ($1 == 4 && DB_VERSION_MAJOR >= 5)
    38 yes
    39 #endif
    40 ],[
    41 --- ext/dba/dba_db4.c 2013-07-03 08:10:53.000000000 +0200
    42 +++ ext/dba/dba_db4.c 2013-08-07 19:19:04.827562638 +0200
    43 @@ -44,7 +44,7 @@
    44 {
    45 TSRMLS_FETCH();
    46
    47 -#if (DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8))
    48 +#if (DB_VERSION_MAJOR >= 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 8))
    49 /* Bug 51086, Berkeley DB 4.8.26 */
    50 /* This code suppresses a BDB 4.8+ error message, thus keeping PHP test compatibility */
    51 {
    52 --- ext/dba/tests/dba_db4_handlers.phpt 2013-07-03 08:10:53.000000000 +0200
    53 +++ ext/dba/tests/dba_db4_handlers.phpt 2013-08-07 20:39:34.640194224 +0200
    54 @@ -47,4 +47,4 @@
    55 Test 1
    56 Success: db4 enabled
    57 Test 2 - full info
    58 -.*Berkeley DB (4|5).*
    59 +.*Berkeley DB (4|5|6).*