Verified Commit b53fbe44 authored by Jonah Brüchert's avatar Jonah Brüchert Committed by Linus Jahn

Ubuntu Touch: Fix architecture specific ubuntu mirror

parent 84cd3bf3
......@@ -9,6 +9,15 @@ DATE=$(date +%Y%m%d.%H%M)
ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
case ${ARCH} in
"amd64")
UBUNTU_MIRROR="http://archive.ubuntu.com/ubuntu"
;;
"armhf")
UBUNTU_MIRROR="http://ports.ubuntu.com/ubuntu-ports"
;;
esac
install_deb() {
BASE_URL="${1}"; PKG="${2}"; VERSION="${3}"
DEB_NAME="${PKG}_${VERSION}_${ARCH}.deb"
......@@ -26,7 +35,7 @@ install_dependencies() {
echo "I: Installing QXMPP"
for PKG in libqxmpp-dev libqxmpp0; do
install_deb http://de.archive.ubuntu.com/ubuntu/pool/universe/q/qxmpp/ ${PKG} ${QXMPP_VERSION}
install_deb ${UBUNTU_MIRROR}/pool/universe/q/qxmpp/ ${PKG} ${QXMPP_VERSION}
done
echo "I: Installing libraries"
......@@ -43,7 +52,7 @@ build_kaidan() {
-DCMAKE_MAKE_PROGRAM=/usr/bin/ninja \
-DCMAKE_PREFIX_PATH="${CLICK_TARGET_DIR}" \
-DCMAKE_INSTALL_PREFIX="${CLICK_TARGET_DIR}" \
-DCMAKE_CXX_FLAGS=-isystem\ ${CLICK_TARGET_DIR}/include \
-DCMAKE_CXX_FLAGS=-isystem\ ${CLICK_TARGET_DIR}/include/qxmpp \
-DI18N=1 \
-DUBUNTU_TOUCH=1 \
-DCLICK_ARCH="${ARCH}" \
......
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