Fixes for r2pm -i vala

This commit is contained in:
pancake 2016-05-19 04:11:10 +02:00
parent a8d33e75a6
commit 5ec01b1414
3 changed files with 11 additions and 8 deletions

View File

@ -4,7 +4,7 @@ R2PM_GIT "https://github.com/radare/radare2"
R2PM_DESC "[syspkg] Vala compiler from git"
R2PM_INSTALL() {
sys/vala.sh
sys/vala.sh "${R2PM_PREFIX}"
}
R2PM_UNINSTALL() {

View File

@ -31,7 +31,6 @@ export R2PM_PREFIX="${R2PM_HOMEPREFIX}"
export R2PM_SYSWWWROOT="`r2 -cq -qe http.root --`"
export R2PM_HOMEWWWROOT="${R2HOMEDIR}/www"
export R2PM_WWWROOT="${R2PM_HOMEWWWROOT}"
echo $R2PM_WWWROOT
# pkgconfig
export PKG_CONFIG_PATH="${R2PM_HOMEPREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"

View File

@ -16,8 +16,8 @@ if [ $? = 0 ]; then
export CC
fi
valac --help > /dev/null 2>&1
if [ ! $? = 0 ]; then
#valac --help > /dev/null 2>&1
#if [ ! $? = 0 ]; then
# must install from tarball
VV=0.13.4
SV=$(echo ${VV}|cut -d . -f 1,2)
@ -26,11 +26,15 @@ if [ ! $? = 0 ]; then
tar xjvf vala-${VV}.tar.bz2
fi
cd vala-${VV} || exit 1
./configure --prefix=/usr && \
make && \
sudo make install
./configure --prefix="${PREFIX}" || exit 1
make || exit 1
sudo make install || exit 1
cd ..
fi
#fi
exit 0
# git install
if [ -d vala ]; then
cd vala