From c871c739c502d164f44586f2d47da613fd0618d2 Mon Sep 17 00:00:00 2001 From: mhei Date: Thu, 26 Jul 2012 15:34:45 +0000 Subject: [PATCH] [packages] php5: use bundled libgd for gd extension 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 git-svn-id: svn://svn.openwrt.org/openwrt/packages@32879 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- lang/php5/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 806de3578..178c4eca0 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -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))