Changeset 32900


Ignore:
Timestamp:
2012-07-28T15:00:47+02:00 (6 years ago)
Author:
mhei
Message:

[packages] php5: fix compilation without CONFIG_PHP5_SYSTEMTZDATA selected

Fixes #11917.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch

    r32872 r32900  
    44 
    55History: 
     6r9: fix another compile error without --with-system-tzdata configured 
    67r8: fix compile error without --with-system-tzdata configured 
    78r7: improve check for valid timezone id to exclude directories 
     
    6768        tz->bc = (**tzf == '\1'); 
    6869        *tzf += 1; 
    69 @@ -256,7 +276,397 @@ void timelib_dump_tzinfo(timelib_tzinfo 
     70@@ -256,7 +276,397 @@ 
    7071        } 
    7172 } 
     
    466467        int left = 0, right = tzdb->index_size - 1; 
    467468 #ifdef HAVE_SETLOCALE 
    468 @@ -295,36 +705,125 @@ static int seek_to_tz_position(const uns 
     469@@ -295,36 +705,128 @@ 
    469470        return 0; 
    470471 } 
     
    474475+                              const timelib_tzdb *tzdb) 
    475476+{ 
     477+#ifdef HAVE_SYSTEM_TZDATA 
    476478+       if (tzdb == timezonedb_system) { 
    477479+               char *orig; 
     
    487489+                return 1; 
    488490+       } 
    489 +       else { 
     491+       else 
     492+#endif 
     493+       { 
    490494+               return inmem_seek_to_tz_position(tzf, timezone, tzdb); 
    491495+       } 
     
    597601--- a/ext/date/lib/timelib.m4 
    598602+++ b/ext/date/lib/timelib.m4 
    599 @@ -78,3 +78,17 @@ stdlib.h 
     603@@ -78,3 +78,17 @@ 
    600604  
    601605 dnl Check for strtoll, atoll 
Note: See TracChangeset for help on using the changeset viewer.