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

[packages] php5: use bundled libgd for gd extension

Browse Source 
PHP devs doesn't only include an own copy of libgd but modified
it. As long as these modifications are not part of the offical
libgd distribution, we have to deal with the bundled version.

Details can be found at 
https://bugs.php.net/bug.php?id=55224 and
https://bugs.php.net/bug.php?id=60108

When this problem is fixed upstream, this patch should be reverted.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>



git-svn-id: svn://svn.openwrt.org/openwrt/packages@32879 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mhei 2012-07-26 15:34:45 +00:00
parent 0232955fc4
commit c871c739c5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/php5/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=php
PKG_VERSION:=5.4.5
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.php.net/distributions/
@ -214,7 +214,7 @@ endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gd),)
CONFIGURE_ARGS+= \
--with-gd=shared,"$(STAGING_DIR)/usr" \
--with-gd=shared \
--without-freetype-dir \
--with-jpeg-dir="$(STAGING_DIR)/usr" \
--with-png-dir="$(STAGING_DIR)/usr" \
@ -539,7 +539,7 @@ $(eval $(call BuildModule,dom,DOM,+@PHP5_LIBXML +PACKAGE_php5-mod-dom:libxml2))
$(eval $(call BuildModule,exif,EXIF))
$(eval $(call BuildModule,ftp,FTP,+PACKAGE_php5-mod-ftp:libopenssl))
$(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php5-mod-gettext:libintl-full))
$(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php5-mod-gd:libgd))
$(eval $(call BuildModule,gd,GD graphics))
$(eval $(call BuildModule,gmp,GMP,+PACKAGE_php5-mod-gmp:libgmp))
$(eval $(call BuildModule,hash,Hash))
$(eval $(call BuildModule,http,HTTP,+PACKAGE_php5-mod-http:libcurl +PACKAGE_php5-mod-http:libevent2 +PACKAGE_php5-mod-http:librt))