Changeset 224084 in webkit


Ignore:
Timestamp:
Oct 26, 2017 9:04:18 PM (6 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK][WPE] install-dependencies can't find libapache2-mod-php7.0 on Ubuntu 17.10
​https://bugs.webkit.org/show_bug.cgi?id=178854

Patch by Fujii Hironori <Fujii Hironori> on 2017-10-26
Reviewed by Michael Catanzaro.

Tools:

  • Scripts/webkitpy/port/base.py:

(Port._debian_php_version): Return "-php7.1" if libphp7.1.so found.
(Port._is_debian_php_version_7): Deleted.

  • gtk/install-dependencies: Install libapache2-mod-php instead of libapache2-mod-php7.0.
  • wpe/install-dependencies: Ditto.

LayoutTests:

  • http/conf/debian-httpd-2.2.conf: Removed.
  • http/conf/debian-httpd-2.4-php7.0.conf: Renamed from LayoutTests/http/conf/debian-httpd-2.4-php7.conf.
  • http/conf/debian-httpd-2.4-php7.1.conf: Copied from LayoutTests/http/conf/debian-httpd-2.4-php7.conf.
Location:
trunk
Files:
1 deleted
5 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r224081 r224084  
     12017-10-26  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        [GTK][WPE] install-dependencies can't find libapache2-mod-php7.0 on Ubuntu 17.10
     4        https://bugs.webkit.org/show_bug.cgi?id=178854
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * http/conf/debian-httpd-2.2.conf: Removed.
     9        * http/conf/debian-httpd-2.4-php7.0.conf: Renamed from LayoutTests/http/conf/debian-httpd-2.4-php7.conf.
     10        * http/conf/debian-httpd-2.4-php7.1.conf: Copied from LayoutTests/http/conf/debian-httpd-2.4-php7.conf.
     11
    1122017-10-26  Devin Rousso  <webkit@devinrousso.com>
    213

  • trunk/LayoutTests/http/conf/debian-httpd-2.4-php7.1.conf

    r224083 r224084  
    2828LoadModule cgi_module           modules/mod_cgi.so
    2929LoadModule ssl_module           modules/mod_ssl.so
    30 LoadModule php5_module          modules/libphp5.so
     30LoadModule php7_module          modules/libphp7.1.so
    3131LoadModule asis_module          modules/mod_asis.so
    3232
    … …  
    113113AddHandler send-as-is asis
    114114
    115 <IfModule mod_php5.c>
     115<IfModule mod_php7.c>
    116116    AddType application/x-httpd-php .php
    117117    AddType application/x-httpd-php .bat

  • trunk/Tools/ChangeLog

    r224078 r224084  
     12017-10-26  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        [GTK][WPE] install-dependencies can't find libapache2-mod-php7.0 on Ubuntu 17.10
     4        https://bugs.webkit.org/show_bug.cgi?id=178854
     5
     6        Reviewed by Michael Catanzaro.
     7
     8        * Scripts/webkitpy/port/base.py:
     9        (Port._debian_php_version): Return "-php7.1" if libphp7.1.so found.
     10        (Port._is_debian_php_version_7): Deleted.
     11        * gtk/install-dependencies: Install libapache2-mod-php instead of libapache2-mod-php7.0.
     12        * wpe/install-dependencies: Ditto.
     13
    1142017-10-25  Simon Fraser  <simon.fraser@apple.com>
    215

  • trunk/Tools/Scripts/webkitpy/port/base.py

    r222510 r224084  
    12021202        return False
    12031203
    1204     def _is_debian_php_version_7(self):
    1205         if self._filesystem.exists("/usr/lib/apache2/modules/libphp7.0.so"):
    1206             return True
    1207         return False
    1208 
    12091204    def _is_darwin_php_version_7(self):
    12101205        if self._filesystem.exists("/usr/libexec/apache2/libphp7.so"):
    … …  
    12271222
    12281223    def _debian_php_version(self):
    1229         if self._is_debian_php_version_7():
    1230             return "-php7"
     1224        if self._filesystem.exists("/usr/lib/apache2/modules/libphp7.0.so"):
     1225            return "-php7.0"
     1226        elif self._filesystem.exists("/usr/lib/apache2/modules/libphp7.1.so"):
     1227            return "-php7.1"
     1228        _log.error("No libphp7.x.so found")
    12311229        return ""
    12321230

  • trunk/Tools/gtk/install-dependencies

    r223943 r224084  
    157157        gdb \
    158158        libapache2-mod-bw \
    159         $(aptIfElse libapache2-mod-php7.0 libapache2-mod-php5) \
     159        libapache2-mod-php \
    160160        libcgi-pm-perl \
    161161        libgpg-error-dev \

  • trunk/Tools/wpe/install-dependencies

    r223943 r224084  
    9393        gdb \
    9494        libapache2-mod-bw \
    95         $(aptIfElse libapache2-mod-php7.0 libapache2-mod-php5) \
     95        libapache2-mod-php \
    9696        libcgi-pm-perl \
    9797        psmisc \
Note: See TracChangeset for help on using the changeset viewer.