Bladeren bron

guile path

Bob Mottram 7 jaren geleden
bovenliggende
commit
83ca113ef7
1 gewijzigde bestanden met toevoegingen van 12 en 5 verwijderingen
  1. 12
    5
      src/freedombone-utils-guile

+ 12
- 5
src/freedombone-utils-guile Bestand weergeven

@@ -32,7 +32,7 @@ GUILE_VERSION='2.2.0'
32 32
 GUILE_HASH='c707b9cf6f97ecca3a4e3e704e62b83f95f1aec28ed1535f5d0a1d36af07a015'
33 33
 
34 34
 EIGHTSYNC_REPO="git://git.savannah.gnu.org/8sync.git"
35
-EIGHTSYNC_COMMIT=''
35
+EIGHTSYNC_COMMIT='8cbb7f22227c0afdd3b0bd758ebec0efba2fa1e1'
36 36
 
37 37
 function install_8sync {
38 38
     apt-get -qy install flex libunistring-dev libgc-dev autoconf texinfo
@@ -45,10 +45,11 @@ function install_8sync {
45 45
     git_clone $EIGHTSYNC_REPO $INSTALL_DIR/eightsync
46 46
     cd $INSTALL_DIR/eightsync
47 47
     git checkout ${EIGHTSYNC_COMMIT} -b ${EIGHTSYNC_COMMIT}
48
-    GUILE_PATH=/opt/guile-${GUILE_VERSION}
49
-    PATH=${GUILE_PATH}/bin:$PATH
50
-    export GUILE_CFLAGS="-I${GUILE_PATH}/include"
51
-    export GUILE_LIBS="-L${GUILE_PATH}/lib"
48
+    #GUILE_PATH=/opt/guile-${GUILE_VERSION}
49
+    export GUILE_BASE_PATH=/opt/guile-${GUILE_VERSION}
50
+    export GUILE_CFLAGS="-I${GUILE_BASE_PATH}/include"
51
+    export GUILE_LIBS="-L${GUILE_BASE_PATH}/lib -lguile -lqthreads -ldl -ltermcap -lsocket -lnsl -lm"
52
+    sed -i '/PKG_CHECK_MODULES/d' configure.ac
52 53
     ./bootstrap.sh
53 54
     configure
54 55
     make
@@ -84,6 +85,12 @@ function install_guile {
84 85
     fi
85 86
     cd /
86 87
     tar xvf $INSTALL_DIR/guile-${GUILE_VERSION}-pack-${GUILE_ARCH}-linux-gnu.tar.lz
88
+    if [ ! -d /opt/guile-${GUILE_VERSION}/bin ]; then
89
+        echo 'Guile was not installed'
90
+        exit 825269
91
+    fi
92
+    echo "export GUILE_PATH=/opt/guile-${GUILE_VERSION}/bin" >> ~/.bashrc
93
+    echo 'export PATH=$PATH:$GUILE_PATH' >> ~/.bashrc
87 94
 }
88 95
 
89 96
 # NOTE: deliberately no exit 0