Changeset 204445 in webkit
- Timestamp:
- Aug 13, 2016 8:32:43 AM (8 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r204444 r204445 1 2016-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 1 12 2016-08-12 Gyuyoung Kim <gyuyoung.kim@webkit.org> 2 13 -
trunk/Tools/efl/install-dependencies
r202808 r204445 49 49 } 50 50 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. 53 function aptIfElse { 54 if apt-cache show $1 &>/dev/null; then 55 echo $1 56 else 57 echo $2 58 fi 59 } 60 51 61 function installDependenciesWithApt { 52 62 # These are dependencies necessary for building WebKitEFL. … … 68 78 libfreetype6-dev \ 69 79 libgcrypt11-dev \ 70 libgeoclue-dev\80 $(aptIfElse libgeoclue-2-dev libgeoclue-dev) \ 71 81 libgif-dev \ 72 82 libgl1-mesa-dev \ … … 81 91 liborc-0.4-dev \ 82 92 libp11-kit-dev \ 83 libpng12-dev\93 $(aptIfElse libpng-dev libpng12-dev) \ 84 94 libpulse-dev \ 85 95 libsqlite3-dev \ … … 111 121 apt-get install \ 112 122 apache2 \ 123 $(aptIfElse libapache2-mod-php7.0 libapache2-mod-php5) \ 113 124 libruby \ 114 125 xvfb 115 116 if apt-cache show libapache2-mod-php7.0 &>/dev/null; then117 apt-get install libapache2-mod-php7.0118 else119 apt-get install libapache2-mod-php5120 fi121 126 } 122 127 -
trunk/Tools/gtk/install-dependencies
r204155 r204445 76 76 } 77 77 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. 80 function aptIfElse { 81 if apt-cache show $1 &>/dev/null; then 82 echo $1 83 else 84 echo $2 85 fi 86 } 87 78 88 function installDependenciesWithApt { 79 89 # These are dependencies necessary for building WebKitGTK+. … … 96 106 libenchant-dev \ 97 107 libfaad-dev \ 98 libgeoclue-dev\108 $(aptIfElse libgeoclue-2-dev libgeoclue-dev) \ 99 109 libgirepository1.0-dev \ 100 110 libgl1-mesa-dev \ … … 110 120 libopus-dev \ 111 121 libpango1.0-dev \ 112 libpng12-dev\122 $(aptIfElse libpng-dev libpng12-dev) \ 113 123 libpulse-dev \ 114 124 librsvg2-dev \ … … 136 146 dbus-x11 \ 137 147 libapache2-mod-bw \ 148 $(aptIfElse libapache2-mod-php7.0 libapache2-mod-php5) \ 138 149 libgpg-error-dev \ 139 150 psmisc \ … … 199 210 subversion" 200 211 201 if apt-cache show libapache2-mod-php7.0 &>/dev/null; then202 packages="$packages libapache2-mod-php7.0"203 else204 packages="$packages libapache2-mod-php5"205 fi206 207 212 apt-get install $packages 208 209 213 } 210 214
Note: See TracChangeset
for help on using the changeset viewer.