diff options
| -rw-r--r-- | package/php/Makefile | 28 | ||||
| -rw-r--r-- | package/php/patches/patch-configure | 96 |
2 files changed, 14 insertions, 110 deletions
diff --git a/package/php/Makefile b/package/php/Makefile index 3a2ca799c..47751afbf 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,18 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 5.5.19 +PKG_VERSION:= 5.6.3 PKG_RELEASE:= 1 -PKG_MD5SUM:= c63dcfd8b318d12127ba6d39ecc8a444 +PKG_MD5SUM:= 7635f344145a4edd7dff6ecec795aaea PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang PKG_DEPENDS:= libpthread librt PHP_URL:= http://www.php.net/ PKG_SITES:= http://de.php.net/distributions/ -PKG_SUBPKGS:= PHP PHP_CLI PHP_FASTCGI PHP_FPM -PKGSD_PHP_FASTCGI:= php for fastcgi usage -PKGSN_PHP_FASTCGI:= php +PKG_SUBPKGS:= PHP PHP_CLI PHP_CGI PHP_FPM +PKGSD_PHP_CGI:= php for fastcgi usage +PKGSN_PHP_CGI:= php PKGSD_PHP_FPM:= php for fastcgi process manager usage PKGSN_PHP_FPM:= php PKGSD_PHP_CLI:= php cli @@ -34,8 +34,8 @@ PKGFB_MOD_CURL:= curl PKGFS_MOD_CURL:= libcurl PKGFD_MOD_FTP:= ftp support PKGFD_MOD_GD:= gd support -PKGFB_MOD_GD:= libgd libpng libjpeg-turbo -PKGFS_MOD_GD:= libgd libpng libjpeg-turbo +PKGFB_MOD_GD:= libgd libpng libjpeg-turbo libXpm +PKGFS_MOD_GD:= libgd libpng libjpeg-turbo libxpm PKGFD_MOD_GMP:= gmp support PKGFB_MOD_GMP:= gmp PKGFS_MOD_GMP:= libgmp @@ -76,7 +76,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,PHP,php,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,PHP_CLI,php-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PHP_CLI},${PKG_SECTION})) -$(eval $(call PKG_template,PHP_FASTCGI,php-fastcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PHP_FASTCGI},${PKG_SECTION})) +$(eval $(call PKG_template,PHP_CGI,php-cgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PHP_CGI},${PKG_SECTION})) $(eval $(call PKG_template,PHP_FPM,php-fpm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PHP_FPM},${PKG_SECTION})) define PKG_mod_template @@ -177,7 +177,7 @@ endif ifneq ($(ADK_PACKAGE_PHP_MOD_SESSION),) PKG_CONFIGURE_OPTS+= --enable-session=shared else -PKG_CONFIGURE_OPTS+= --without-session +PKG_CONFIGURE_OPTS+= --disable-session endif ifneq ($(ADK_PACKAGE_PHP_MOD_SNMP),) PKG_CONFIGURE_OPTS+= --with-snmp=shared,"$(STAGING_TARGET_DIR)/usr" @@ -259,13 +259,13 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${INSTALL_DIR} $(IDIR_PHP)/etc ${INSTALL_DATA} ./files/php.ini $(IDIR_PHP)/etc ${INSTALL_DIR} $(IDIR_PHP_CLI)/usr/bin - ${INSTALL_BIN} $(WRKBUILD)/sapi/cli/php $(IDIR_PHP_CLI)/usr/bin/php - ${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/usr/bin + ${INSTALL_BIN} $(WRKBUILD)/sapi/cli/php \ + $(IDIR_PHP_CLI)/usr/bin + ${INSTALL_DIR} $(IDIR_PHP_CGI)/usr/bin ${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi \ - $(IDIR_PHP_FASTCGI)/usr/bin/php + $(IDIR_PHP_CGI)/usr/bin ${INSTALL_DIR} $(IDIR_PHP_FPM)/etc - $(CP) ./files/php-fpm.conf \ - $(IDIR_PHP_FPM)/etc + $(CP) ./files/php-fpm.conf $(IDIR_PHP_FPM)/etc ${INSTALL_DIR} $(IDIR_PHP_FPM)/usr/bin ${INSTALL_BIN} $(WRKBUILD)/sapi/fpm/php-fpm \ $(IDIR_PHP_FPM)/usr/bin/php diff --git a/package/php/patches/patch-configure b/package/php/patches/patch-configure deleted file mode 100644 index f7d6194c8..000000000 --- a/package/php/patches/patch-configure +++ /dev/null @@ -1,96 +0,0 @@ ---- php-5.5.10.orig/configure 2014-03-05 11:52:32.000000000 +0100 -+++ php-5.5.10/configure 2014-03-11 19:16:14.718425962 +0100 -@@ -37475,19 +37475,7 @@ fi - - - php_with_xpm_dir=no -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the location of libXpm" >&5 --$as_echo_n "checking for the location of libXpm... " >&6; } -- --# Check whether --with-xpm-dir was given. --if test "${with_xpm_dir+set}" = set; then : -- withval=$with_xpm_dir; PHP_XPM_DIR=$withval --else -- -- PHP_XPM_DIR=no -- -- --fi -+PHP_XPM_DIR=no - - - ext_output=$PHP_XPM_DIR -@@ -39551,13 +39539,6 @@ $as_echo "#define HAVE_GD_JPG 1" >>confd - GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBJPEG" - fi - -- if test -n "$GD_XPM_DIR"; then -- --$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h -- -- GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" -- fi -- - if test -n "$FREETYPE2_DIR"; then - - $as_echo "#define HAVE_GD_FREETYPE 1" >>confdefs.h -@@ -42258,58 +42239,6 @@ fi - esac - done - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreateFromXpm in -lgd" >&5 --$as_echo_n "checking for gdImageCreateFromXpm in -lgd... " >&6; } --if ${ac_cv_lib_gd_gdImageCreateFromXpm+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lgd $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char gdImageCreateFromXpm (); --int --main () --{ --return gdImageCreateFromXpm (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_gd_gdImageCreateFromXpm=yes --else -- ac_cv_lib_gd_gdImageCreateFromXpm=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreateFromXpm" >&5 --$as_echo "$ac_cv_lib_gd_gdImageCreateFromXpm" >&6; } --if test "x$ac_cv_lib_gd_gdImageCreateFromXpm" = xyes; then : -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- --$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h -- -- --else -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_gd_gdImageCreateFromXpm -- -- --fi - - - save_old_LDFLAGS=$LDFLAGS |