Browse Source

install specific yaf version in its own setup file

Keith Newman 9 years ago
parent
commit
23be40ce9b

+ 1 - 1
config/php.ini

@@ -869,7 +869,7 @@ default_socket_timeout = 60
 zend_extension=opcache.so
 extension=redis.so
 extension=phalcon.so
-;extension=yaf.so
+extension=yaf.so
 extension=mongodb.so
 ;extension=php_bz2.dll
 ;extension=php_curl.dll

+ 1 - 1
frameworks/PHP/yaf/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx
+fw_depends php yaf nginx
 
 sed -i 's|host=localhost|host='"${DBHOST}"'|g' app/conf/application.ini
 sed -i 's|root .*/FrameworkBenchmarks/php-yaf|root '"${TROOT}"'|g' deploy/nginx.conf 

+ 14 - 0
toolset/setup/linux/frameworks/yaf.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+fw_depends php
+
+RETCODE=$(fw_exists ${IROOT}/yaf.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/yaf.installed
+  return 0; }
+
+printf "\n" | $PHP_HOME/bin/pecl -q install -f yaf-2.2.9
+
+echo "" > $IROOT/yaf.installed
+
+source $IROOT/yaf.installed

+ 12 - 12
toolset/setup/linux/languages/php.sh

@@ -44,7 +44,7 @@ echo PHP compilation finished, installing extensions
 $PHP_HOME/bin/pecl channel-update pecl.php.net
 # Apc.so
 $PHP_HOME/bin/pecl config-set php_ini $PHP_HOME/lib/php.ini
-printf "\n" | $PHP_HOME/bin/pecl -q install -f redis
+printf "\n" | $PHP_HOME/bin/pecl -q install -f redis-2.2.5
 
 # yaf.so
 # printf "\n" | $PHP_HOME/bin/pecl -q install -f yaf
@@ -53,17 +53,17 @@ printf "\n" | $PHP_HOME/bin/pecl -q install -f redis
 #   The configure seems broken, does not respect prefix. If you 
 #   update the value of PATH then it finds the prefix from `which php`
 
-fw_get -O https://github.com/phalcon/cphalcon/archive/phalcon-v1.3.2.tar.gz
-fw_untar phalcon-v1.3.2.tar.gz
-cd cphalcon-phalcon-v1.3.2/build/64bits 
-$PHP_HOME/bin/phpize
-# For some reason we have to point to php-config 
-# explicitly, it's not found by the prefix settings
-./configure --prefix=$PHP_HOME --exec-prefix=$PHP_HOME \
-  --with-php-config=$PHP_HOME/bin/php-config \
-  --enable-phalcon --quiet
-make --quiet
-make install
+# fw_get -O https://github.com/phalcon/cphalcon/archive/phalcon-v1.3.2.tar.gz
+# fw_untar phalcon-v1.3.2.tar.gz
+# cd cphalcon-phalcon-v1.3.2/build/64bits 
+# $PHP_HOME/bin/phpize
+# # For some reason we have to point to php-config 
+# # explicitly, it's not found by the prefix settings
+# ./configure --prefix=$PHP_HOME --exec-prefix=$PHP_HOME \
+#   --with-php-config=$PHP_HOME/bin/php-config \
+#   --enable-phalcon --quiet
+# make --quiet
+# make install
 
 # mongodb.so
 printf "\n" | $PHP_HOME/bin/pecl -q install -f mongodb