Commit 5fea7d8

Skunnykmikefero

authored and

committed

Correct static build for extension

* Fix PHP version detection * `phpize`; check the version with `php-config` * PHP `./configure` static build; use $PHP_VERSION

1 parent 876f3f0 commit 5fea7d8Copy full SHA for 5fea7d8

File tree

+15

-1

lines changed

+15

-1

lines changed

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,20 @@ PHP_ARG_WITH(cassandra, Enable Cassandra extension,`
`2`	`2`	`[ --with-cassandra[=DIR] Enable the Cassandra extension.])`
`3`	`3`
`4`	`4`	`AC_MSG_CHECKING([for supported PHP version])`
`5`		-PHP_CASSANDRA_FOUND_PHP_VERSION=`${PHP_CONFIG} --version`
	`5`	`+if test -z "$PHP_VERSION"; then`
	`6`	`+ if test -z "$PHP_CONFIG"; then`
	`7`	`+ AC_MSG_ERROR([php-config not found])`
	`8`	`+ fi`
	`9`	+ PHP_CASSANDRA_FOUND_PHP_VERSION=`$PHP_CONFIG --version`
	`10`	`+else`
	`11`	`+ PHP_CASSANDRA_FOUND_PHP_VERSION="$PHP_VERSION"`
	`12`	`+fi`
	`13`	`+`
`6`	`14`	PHP_CASSANDRA_FOUND_PHP_VERSION_NUMBER=`echo "${PHP_CASSANDRA_FOUND_PHP_VERSION}" \| $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 100 + [$]2) * 100 + [$]3;}'`
	`15`	`+if test -z "$PHP_CASSANDRA_FOUND_PHP_VERSION_NUMBER"; then`
	`16`	`+ AC_MSG_ERROR([failed to detect PHP version, please report])`
	`17`	`+fi`
	`18`	`+`
`7`	`19`	`if test "$PHP_CASSANDRA_FOUND_PHP_VERSION_NUMBER" -lt "50600"; then`
`8`	`20`	`AC_MSG_ERROR([not supported. PHP version 5.6.0+ required (found $PHP_CASSANDRA_FOUND_PHP_VERSION)])`
`9`	`21`	`else`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -460,6 +460,8 @@ php5to7_string_compare(php5to7_string s1, php5to7_string s2)`
`460`	`460`
`461`	`461`	`extern zend_module_entry php_driver_module_entry;`
`462`	`462`
	`463`	`+#define phpext_cassandra_ptr &php_driver_module_entry`
	`464`	`+`
`463`	`465`	`PHP_MINIT_FUNCTION(php_driver);`
`464`	`466`	`PHP_MSHUTDOWN_FUNCTION(php_driver);`
`465`	`467`	`PHP_RINIT_FUNCTION(php_driver);`

Comments

(0)