ソースを参照

Fix toxcore installation

Bob Mottram 7 年 前
コミット
1308cf69ac
共有1 個のファイルを変更した10 個の追加8 個の削除を含む
  1. 10
    8
      src/freedombone-app-tox

+ 10
- 8
src/freedombone-app-tox ファイルの表示

479
         chroot "${rootdir}" apt-get -yq install automake checkinstall check git yasm
479
         chroot "${rootdir}" apt-get -yq install automake checkinstall check git yasm
480
         chroot "${rootdir}" apt-get -yq install libsodium18 libsodium-dev libcap2-bin
480
         chroot "${rootdir}" apt-get -yq install libsodium18 libsodium-dev libcap2-bin
481
         chroot "${rootdir}" apt-get -yq install libconfig9 libconfig-dev autoconf
481
         chroot "${rootdir}" apt-get -yq install libconfig9 libconfig-dev autoconf
482
-        chroot "${rootdir}" apt-get -yq install libopus-dev libvpx-dev
482
+        chroot "${rootdir}" apt-get -yq install libopus-dev libvpx-dev cmake
483
     else
483
     else
484
         apt-get -yq install build-essential libtool autotools-dev
484
         apt-get -yq install build-essential libtool autotools-dev
485
         apt-get -yq install automake checkinstall check git yasm
485
         apt-get -yq install automake checkinstall check git yasm
486
         apt-get -yq install libsodium18 libsodium-dev libcap2-bin
486
         apt-get -yq install libsodium18 libsodium-dev libcap2-bin
487
         apt-get -yq install libconfig9 libconfig-dev autoconf
487
         apt-get -yq install libconfig9 libconfig-dev autoconf
488
-        apt-get -yq install libopus-dev libvpx-dev
488
+        apt-get -yq install libopus-dev libvpx-dev cmake
489
     fi
489
     fi
490
 
490
 
491
     if [ ! -d "${rootdir}${INSTALL_DIR}" ]; then
491
     if [ ! -d "${rootdir}${INSTALL_DIR}" ]; then
509
     if [ "${rootdir}" ]; then
509
     if [ "${rootdir}" ]; then
510
         chroot "${rootdir}" /bin/bash -x <<EOF
510
         chroot "${rootdir}" /bin/bash -x <<EOF
511
 cd ${INSTALL_DIR}/toxcore
511
 cd ${INSTALL_DIR}/toxcore
512
-autoreconf -i
513
-./configure --enable-daemon --prefix=/usr/local
514
-make clean
512
+./autogen.sh
513
+mkdir _build
514
+cd _build || exit 1
515
+cmake ..
515
 make
516
 make
516
 make install
517
 make install
517
 EOF
518
 EOF
518
     else
519
     else
519
         /bin/bash -x <<EOF
520
         /bin/bash -x <<EOF
520
 cd ${INSTALL_DIR}/toxcore
521
 cd ${INSTALL_DIR}/toxcore
521
-autoreconf -i
522
-./configure --enable-daemon --prefix=/usr/local
523
-make clean
522
+./autogen.sh
523
+mkdir _build
524
+cd _build || exit 1
525
+cmake ..
524
 make
526
 make
525
 make install
527
 make install
526
 EOF
528
 EOF