bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] php5: fix APC support

Browse Source 
The APC patch adds the APC extension to the source tree. However,
when it was selected nothing happens since the extension wasn't
'registered'. This is what a 'buildconf' run usually does.
This however needs version 2.13 of autoconf. So instead of
requiring this (additional) autoconf version on the build system
the files changed are included in an additional patch.



git-svn-id: svn://svn.openwrt.org/openwrt/packages@26824 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mhei 2011-05-04 18:27:36 +00:00
parent e36068489e
commit 55671220de
3 changed files with 19116 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lang/php5/Makefile
View File

@ -36,10 +36,6 @@ define Package/php5/Default/description
endef
define Package/php5/config
config PHP5_APC
bool "PHP5 APC support"
depends on PACKAGE_php5-cli || PACKAGE_php5-cgi
config PHP5_FILTER
bool "PHP5 Filter support"
depends on PACKAGE_php5-cli || PACKAGE_php5-cgi
@ -55,6 +51,9 @@ define Package/php5
ifneq ($(CONFIG_PHP5_LIBXML),)
DEPENDS+= +libxml2
endif
ifneq ($(CONFIG_PACKAGE_php5-mod-apc),)
DEPENDS+= +librt
endif
ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite3)$(CONFIG_PACKAGE_php5-mod-pdo-sqlite),)
DEPENDS+= +libsqlite3 +libpthread
endif
@ -137,6 +136,13 @@ ifneq ($(SDK),)
CONFIG_PACKAGE_php5-mod-xml:=m
endif
ifneq ($(CONFIG_PACKAGE_php5-mod-apc),)
PKG_CONFIGURE_OPTS+= --enable-apc=shared --disable-apc-mmap --disable-apc-pthreadmutex
PKG_CONFIGURE_LIBS+= -lrt
else
PKG_CONFIGURE_OPTS+= --disable-apc
endif
ifneq ($(CONFIG_PACKAGE_php5-mod-ctype),)
PKG_CONFIGURE_OPTS+= --enable-ctype=shared
else
@ -361,13 +367,6 @@ else
PKG_CONFIGURE_OPTS+= --disable-xmlwriter
endif
ifneq ($(CONFIG_PHP5_APC),)
PKG_CONFIGURE_OPTS+= --enable-apc --disable-apc-mmap --disable-apc-pthreadmutex
PKG_CONFIGURE_LIBS+= -lrt
else
PKG_CONFIGURE_OPTS+= --disable-apc
endif
ifneq ($(CONFIG_PHP5_FILTER),)
PKG_CONFIGURE_OPTS+= --enable-filter
else
@ -484,6 +483,7 @@ $(eval $(call BuildPackage,php5-cli))
$(eval $(call BuildPackage,php5-cgi))
$(eval $(call BuildPackage,php5-fastcgi))
$(eval $(call BuildModule,apc,APC))
$(eval $(call BuildModule,ctype,Ctype))
$(eval $(call BuildModule,curl,cURL,php5 +libcurl))
$(eval $(call BuildModule,fileinfo,Fileinfo,php5 +libmagic))

2
lang/php5/files/php.ini
View File

@ -197,7 +197,7 @@ default_socket_timeout = 60
[APC]
apc.enabled = 1
apc.shm_segments = 1 ;The number of shared memory segments to allocate for the compiler cache.
apc.shm_size = 4 ;The size of each shared memory segment in MB.
apc.shm_size = 4M ;The size of each shared memory segment.
[Date]
;date.timezone =

19104
lang/php5/patches/900-prevent_buildconf_force.patch Normal file
View File

File diff suppressed because it is too large Load Diff