Changeset 204445 in webkit


Ignore:
Timestamp:
Aug 13, 2016 8:32:43 AM (8 years ago)
Author:
clopez@igalia.com
Message:

[EFL][GTK] Install script not working on Debian 9 (testing) and Ubuntu 16.10
https://bugs.webkit.org/show_bug.cgi?id=160809

Reviewed by Carlos Garcia Campos.

  • efl/install-dependencies: Factorize the previous logic for handling the php5/7

case, and use it also for the new package names of libpng and libgeoclue.

  • gtk/install-dependencies: Ditto.
Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r204444 r204445  
     12016-08-13  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        [EFL][GTK] Install script not working on Debian 9 (testing) and Ubuntu 16.10
     4        https://bugs.webkit.org/show_bug.cgi?id=160809
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * efl/install-dependencies: Factorize the previous logic for handling the php5/7
     9        case, and use it also for the new package names of libpng and libgeoclue.
     10        * gtk/install-dependencies: Ditto.
     11
    1122016-08-12  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
    213
  • trunk/Tools/efl/install-dependencies

    r202808 r204445  
    4949}
    5050
     51# If the package $1 is available, prints it. Otherwise prints $2.
     52# Useful for handling when a package is renamed on new versions of Debian/Ubuntu.
     53function aptIfElse {
     54    if apt-cache show $1 &>/dev/null; then
     55        echo $1
     56    else
     57        echo $2
     58    fi
     59}
     60
    5161function installDependenciesWithApt {
    5262    # These are dependencies necessary for building WebKitEFL.
     
    6878        libfreetype6-dev \
    6979        libgcrypt11-dev \
    70         libgeoclue-dev \
     80        $(aptIfElse libgeoclue-2-dev libgeoclue-dev) \
    7181        libgif-dev \
    7282        libgl1-mesa-dev \
     
    8191        liborc-0.4-dev \
    8292        libp11-kit-dev \
    83         libpng12-dev \
     93        $(aptIfElse libpng-dev libpng12-dev) \
    8494        libpulse-dev \
    8595        libsqlite3-dev \
     
    111121    apt-get install \
    112122        apache2 \
     123        $(aptIfElse libapache2-mod-php7.0 libapache2-mod-php5) \
    113124        libruby \
    114125        xvfb
    115 
    116     if apt-cache show libapache2-mod-php7.0 &>/dev/null; then
    117         apt-get install libapache2-mod-php7.0
    118     else
    119         apt-get install libapache2-mod-php5
    120     fi
    121126}
    122127
  • trunk/Tools/gtk/install-dependencies

    r204155 r204445  
    7676}
    7777
     78# If the package $1 is available, prints it. Otherwise prints $2.
     79# Useful for handling when a package is renamed on new versions of Debian/Ubuntu.
     80function aptIfElse {
     81    if apt-cache show $1 &>/dev/null; then
     82        echo $1
     83    else
     84        echo $2
     85    fi
     86}
     87
    7888function installDependenciesWithApt {
    7989    # These are dependencies necessary for building WebKitGTK+.
     
    96106        libenchant-dev \
    97107        libfaad-dev \
    98         libgeoclue-dev \
     108        $(aptIfElse libgeoclue-2-dev libgeoclue-dev) \
    99109        libgirepository1.0-dev \
    100110        libgl1-mesa-dev \
     
    110120        libopus-dev \
    111121        libpango1.0-dev \
    112         libpng12-dev \
     122        $(aptIfElse libpng-dev libpng12-dev) \
    113123        libpulse-dev \
    114124        librsvg2-dev \
     
    136146        dbus-x11 \
    137147        libapache2-mod-bw \
     148        $(aptIfElse libapache2-mod-php7.0 libapache2-mod-php5) \
    138149        libgpg-error-dev \
    139150        psmisc \
     
    199210        subversion"
    200211
    201     if apt-cache show libapache2-mod-php7.0 &>/dev/null; then
    202         packages="$packages libapache2-mod-php7.0"
    203     else
    204         packages="$packages libapache2-mod-php5"
    205     fi
    206 
    207212    apt-get install $packages
    208 
    209213}
    210214
Note: See TracChangeset for help on using the changeset viewer.