Commit 22f21082 authored by Jonah Brüchert's avatar Jonah Brüchert 🌳 Committed by Linus Jahn

Fix Ubuntu Touch dependency build script properly

parent a1e5f565
Pipeline #3162 passed with stage
in 4 minutes and 47 seconds
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
"ninja-build", "ninja-build",
"curl", "curl",
"extra-cmake-modules", "extra-cmake-modules",
"kirigami2-dev:armhf" "kirigami2-dev:$(dpkg-architecture -qDEB_HOST_ARCH)",
"libidn11-dev:$(dpkg-architecture -qDEB_HOST_ARCH)",
"libgnutls-dev:$(dpkg-architecture -qDEB_HOST_ARCH)"
] ]
} }
...@@ -22,20 +22,8 @@ install_deb() { ...@@ -22,20 +22,8 @@ install_deb() {
} }
install_dependencies() { install_dependencies() {
LIBIDN_VERSION="1.33-2.2ubuntu1"
GNUTLS_VERSION="3.2.11-2ubuntu1.2"
GLOOX_VERSION="1.0.20-1+16.04+xenial+build1" GLOOX_VERSION="1.0.20-1+16.04+xenial+build1"
echo "I: Installing libidn"
for PKG in libidn11-dev libidn11; do
install_deb http://ports.ubuntu.com/ubuntu-ports/pool/main/libi/libidn ${PKG} ${LIBIDN_VERSION}
done
echo "I: Installing gnutls"
for PKG in libgnutls28-dev libgnutls28; do
install_deb http://ports.ubuntu.com/ubuntu-ports/pool/universe/g/gnutls28 ${PKG} ${GNUTLS_VERSION}
done
echo "I: Installing gloox" echo "I: Installing gloox"
for PKG in libgloox-dev libgloox17; do for PKG in libgloox-dev libgloox17; do
install_deb http://neon.plasma-mobile.org:8080/pool/main/g/gloox ${PKG} ${GLOOX_VERSION} install_deb http://neon.plasma-mobile.org:8080/pool/main/g/gloox ${PKG} ${GLOOX_VERSION}
...@@ -71,8 +59,7 @@ cleanup_click_dir() { ...@@ -71,8 +59,7 @@ cleanup_click_dir() {
$CLICK_TARGET_DIR/usr \ $CLICK_TARGET_DIR/usr \
$CLICK_TARGET_DIR/include \ $CLICK_TARGET_DIR/include \
$CLICK_TARGET_DIR/share/doc \ $CLICK_TARGET_DIR/share/doc \
$CLICK_TARGET_DIR/lib/$DEB_HOST_MULTIARCH/pkgconfig \ $CLICK_TARGET_DIR/lib/$DEB_HOST_MULTIARCH/pkgconfig
$CLICK_TARGET_DIR/lib/$DEB_HOST_MULTIARCH/libidn.so
} }
echo "*****************************************" echo "*****************************************"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment