Ver Fonte

Merge branch 'move-phalcon-to-its-own-setup-file' into php-fixes

Keith Newman há 9 anos atrás
pai
commit
737b728c9f

+ 1 - 1
frameworks/PHP/phalcon-micro/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx
+fw_depends php phalcon nginx
 
 sed -i 's|localhost|'"${DBHOST}"'|g' public/index.php
 sed -i 's|root .*/FrameworkBenchmarks/php-phalcon-micro|root '"${TROOT}"'|g' deploy/nginx.conf

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends php nginx
+fw_depends php phalcon nginx
 
 sed -i 's|mongodb://localhost|mongodb://'"${DBHOST}"'|g' app/config/config.php
 sed -i 's|localhost|'"${DBHOST}"'|g' app/config/config.php

+ 24 - 0
toolset/setup/linux/frameworks/phalcon.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+fw_depends php
+
+RETCODE=$(fw_exists ${IROOT}/phalcon.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/phalcon.installed
+  return 0; }
+
+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
+
+echo "" > $IROOT/phalcon.installed
+
+source $IROOT/phalcon.installed

+ 0 - 16
toolset/setup/linux/languages/php.sh

@@ -49,22 +49,6 @@ printf "\n" | $PHP_HOME/bin/pecl -q install -f redis
 # yaf.so
 # printf "\n" | $PHP_HOME/bin/pecl -q install -f yaf
 
-# phalcon.so
-#   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
-
 # mongodb.so
 printf "\n" | $PHP_HOME/bin/pecl -q install -f mongodb