Title: [204445] trunk/Tools
- Revision
- 204445
- Author
- [email protected]
- Date
- 2016-08-13 08:32:43 -0700 (Sat, 13 Aug 2016)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (204444 => 204445)
--- trunk/Tools/ChangeLog 2016-08-13 06:11:49 UTC (rev 204444)
+++ trunk/Tools/ChangeLog 2016-08-13 15:32:43 UTC (rev 204445)
@@ -1,3 +1,14 @@
+2016-08-13 Carlos Alberto Lopez Perez <[email protected]>
+
+ [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.
+
2016-08-12 Gyuyoung Kim <[email protected]>
Skip to check directories existence in build-webkit
Modified: trunk/Tools/efl/install-dependencies (204444 => 204445)
--- trunk/Tools/efl/install-dependencies 2016-08-13 06:11:49 UTC (rev 204444)
+++ trunk/Tools/efl/install-dependencies 2016-08-13 15:32:43 UTC (rev 204445)
@@ -48,6 +48,16 @@
printNotSupportedMessageAndExit
}
+# If the package $1 is available, prints it. Otherwise prints $2.
+# Useful for handling when a package is renamed on new versions of Debian/Ubuntu.
+function aptIfElse {
+ if apt-cache show $1 &>/dev/null; then
+ echo $1
+ else
+ echo $2
+ fi
+}
+
function installDependenciesWithApt {
# These are dependencies necessary for building WebKitEFL.
apt-get install \
@@ -67,7 +77,7 @@
libffi-dev \
libfreetype6-dev \
libgcrypt11-dev \
- libgeoclue-dev \
+ $(aptIfElse libgeoclue-2-dev libgeoclue-dev) \
libgif-dev \
libgl1-mesa-dev \
libgnutls28-dev \
@@ -80,7 +90,7 @@
libmpg123-dev \
liborc-0.4-dev \
libp11-kit-dev \
- libpng12-dev \
+ $(aptIfElse libpng-dev libpng12-dev) \
libpulse-dev \
libsqlite3-dev \
libssl-dev \
@@ -110,14 +120,9 @@
# These are dependencies necessary for running tests.
apt-get install \
apache2 \
+ $(aptIfElse libapache2-mod-php7.0 libapache2-mod-php5) \
libruby \
xvfb
-
- if apt-cache show libapache2-mod-php7.0 &>/dev/null; then
- apt-get install libapache2-mod-php7.0
- else
- apt-get install libapache2-mod-php5
- fi
}
checkInstaller
Modified: trunk/Tools/gtk/install-dependencies (204444 => 204445)
--- trunk/Tools/gtk/install-dependencies 2016-08-13 06:11:49 UTC (rev 204444)
+++ trunk/Tools/gtk/install-dependencies 2016-08-13 15:32:43 UTC (rev 204445)
@@ -75,6 +75,16 @@
xz
}
+# If the package $1 is available, prints it. Otherwise prints $2.
+# Useful for handling when a package is renamed on new versions of Debian/Ubuntu.
+function aptIfElse {
+ if apt-cache show $1 &>/dev/null; then
+ echo $1
+ else
+ echo $2
+ fi
+}
+
function installDependenciesWithApt {
# These are dependencies necessary for building WebKitGTK+.
packages=" \
@@ -95,7 +105,7 @@
libedit-dev \
libenchant-dev \
libfaad-dev \
- libgeoclue-dev \
+ $(aptIfElse libgeoclue-2-dev libgeoclue-dev) \
libgirepository1.0-dev \
libgl1-mesa-dev \
libgl1-mesa-glx \
@@ -109,7 +119,7 @@
libnotify-dev \
libopus-dev \
libpango1.0-dev \
- libpng12-dev \
+ $(aptIfElse libpng-dev libpng12-dev) \
libpulse-dev \
librsvg2-dev \
libsecret-1-dev \
@@ -135,6 +145,7 @@
curl \
dbus-x11 \
libapache2-mod-bw \
+ $(aptIfElse libapache2-mod-php7.0 libapache2-mod-php5) \
libgpg-error-dev \
psmisc \
pulseaudio-utils \
@@ -198,14 +209,7 @@
git-svn \
subversion"
- if apt-cache show libapache2-mod-php7.0 &>/dev/null; then
- packages="$packages libapache2-mod-php7.0"
- else
- packages="$packages libapache2-mod-php5"
- fi
-
apt-get install $packages
-
}
function installDependenciesWithPacman {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
