Ticket #7286: curl-libpcre-fix.patch

File curl-libpcre-fix.patch, 1.7 KB (added by scottmc, 12 years ago)

patch that should fix the webpositive and pe issues with the updated libpcre and curl builds

  • OptionalPackages

     
    474474if [ IsOptionalHaikuImagePackageAdded Curl ] {
    475475    if $(TARGET_ARCH) != x86 {
    476476        Echo "No optional package Curl available for $(TARGET_ARCH)" ;
    477     } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
    478         InstallOptionalHaikuImagePackage curl-7.21.3-x86-gcc4-2010-12-29.zip
    479             : $(baseURL)/curl-7.21.3-x86-gcc4-2010-12-29.zip
    480             : : true ;
    481477    } else {
    482         InstallOptionalHaikuImagePackage curl-7.21.3-x86-gcc2-2010-12-23.zip
    483             : $(baseURL)/curl-7.21.3-x86-gcc2-2010-12-23.zip
     478        # The gcc2 package for curl/libcurl should work for both gcc2 and gcc4 builds
     479        InstallOptionalHaikuImagePackage curl-7.21.4-x86-gcc2-2011-02-28.zip
     480            : $(baseURL)/curl-7.21.4-x86-gcc2-2011-02-28.zip
    484481            : : true ;
    485     }
     482    } 
    486483}
    487484
    488485
    … …  
    14331430    if $(TARGET_ARCH) != x86 {
    14341431        Echo "No optional package PCRE available for $(TARGET_ARCH)" ;
    14351432    } else {
    1436         if $(HAIKU_GCC_VERSION[1]) >= 4 {
    1437             InstallOptionalHaikuImagePackage pcre-7.9-x86-gcc4-2009-09-30.zip
    1438                 : $(baseURL)/pcre-7.9-x86-gcc4-2009-09-30.zip
     1433        # The gcc2 package for libpcre should work for both gcc2 and gcc4 builds
     1434        InstallOptionalHaikuImagePackage
     1435            libpcre-8.12-x86-gcc2-2011-02-28.zip
     1436            : $(baseURL)/libpcre-8.12-x86-gcc2-2011-02-28.zip
    14391437            ;
    1440         } else {
    1441             InstallOptionalHaikuImagePackage
    1442                 libpcre-8.02-r1a2-x86-gcc2-2010-04-28-a.zip
    1443                 : $(baseURL)/libpcre-8.02-r1a2-x86-gcc2-2010-04-28-a.zip
    1444             ;
    1445         }
    1446         InstallSourceArchive libpcre-8.02_haiku-2010-04-29.tar.xz
    1447             : $(baseSourceURL)/2010/libpcre-8.02_haiku-2010-04-29.tar.xz ;
    14481438    }
    14491439}
    14501440