Permalink
Browse files

Added support for php5.2, removed libiconv dependency by system one

  • Loading branch information...
1 parent dfea33c commit eafe69361cd306f22745f3c9756bced81adba711 @bananos committed Apr 5, 2012
Showing with 24 additions and 25 deletions.
  1. +9 −5 README.md
  2. +12 −20 buildout-base.cfg
  3. +3 −0 buildout.cfg
View
14 README.md
@@ -2,6 +2,9 @@ MAMP-buildout
==============
Install Apache/MySQL/PHP stack on your Mac for development purposes.
+**PHP 5.2/5.3 support!**
+
+Works on OSX 10.7.3 / Xcode 4.3 / llvm-gcc-4.2
Installation
-------------
@@ -16,10 +19,10 @@ Installation
http://dev.mysql.com/get/Downloads/MySQL-5.1/mysql-5.1.60.tar.gz/from/http://mysql.infocom.ua/
http://us3.php.net/get/php-5.3.8.tar.gz/from/ua.php.net/mirror
-http://curl.download.nextag.com/download/curl-7.20.0.tar.gz
-http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.9.2.tar.gz
-http://www.ijg.org/files/jpegsrc.v8c.tar.gz
-http://prdownloads.sourceforge.net/libpng/libpng-1.4.0.tar.gz
+http://us3.php.net/get/php-5.2.17.tar.gz/from/ua.php.net/mirror
+http://curl.linux-mirror.org/download/curl-7.25.0.tar.gz
+http://www.ijg.org/files/jpegsrc.v8d.tar.gz
+http://prdownloads.sourceforge.net/libpng/libpng-1.5.10.tar.gz
http://prdownloads.sourceforge.net/freetype/freetype-2.1.9.tar.bz2
ftp://ftp.gnu.org/gnu/gettext/gettext-0.18.1.1.tar.gz
http://www.apache.org/dist//httpd/httpd-2.2.22.tar.gz
@@ -231,13 +234,14 @@ PHP/MySQL versions known to work
This buildout currently tested on following configurations:
1. php-5.3.8 / MySQL-5.1.60
+2. php-5.2.17 / MySQL-5.1.60
2. @TODO add php-5.2 / php-5.1 and MySQL 5.5 versions
TODO
-----
-1. Add support for php-5.1, php-5.2
+1. Add support for php-5.1
2. Add PostgreSQL
View
32 buildout-base.cfg
@@ -13,7 +13,6 @@ download-cache = ${buildout:directory}/thirdparty
php-parts =
curl
- libiconv
jpeg
png
freetype
@@ -90,33 +89,25 @@ command =
[curl]
recipe = hexagonit.recipe.cmmi
keep-compile-dir = false
-url = http://curl.download.nextag.com/download/curl-7.20.0.tar.gz
-#url = ${buildout:directory}/thirdparty/curl-7.20.0.tar.gz
+url = http://curl.linux-mirror.org/download/curl-7.25.0.tar.gz
+#url = ${buildout:directory}/thirdparty/curl-7.25.0.tar.gz
configure-options =
--prefix=${buildout:directory}/parts/curl
-[libiconv]
-recipe = hexagonit.recipe.cmmi
-keep-compile-dir = false
-url = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.9.2.tar.gz
-#url = ${buildout:directory}/thirdparty/libiconv-1.9.2.tar.gz
-configure-options =
- --prefix=${buildout:directory}/parts/libiconv
-
[jpeg]
recipe = hexagonit.recipe.cmmi
keep-compile-dir = false
-url = http://www.ijg.org/files/jpegsrc.v8c.tar.gz
-#url = ${buildout:directory}/thirdparty/jpegsrc.v8c.tar.gz
+url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz
+#url = ${buildout:directory}/thirdparty/jpegsrc.v8d.tar.gz
configure-options =
--prefix=${buildout:directory}/parts/jpeg
[png]
recipe = hexagonit.recipe.cmmi
keep-compile-dir = false
-url = http://prdownloads.sourceforge.net/libpng/libpng-1.4.0.tar.gz
-#url = ${buildout:directory}/thirdparty/libpng-1.4.0.tar.gz
+url = http://prdownloads.sourceforge.net/libpng/libpng-1.5.10.tar.gz
+#url = http://prdownloads.sourceforge.net/libpng/libpng-1.5.10.tar.gz
configure-options =
--prefix=${buildout:directory}/parts/png
@@ -155,12 +146,14 @@ patches =
[php]
-version = 5.3.8
+#version = 5.3.8
recipe = hexagonit.recipe.cmmi
keep-compile-dir = false
-url = http://us3.php.net/get/php-5.3.8.tar.gz/from/ua.php.net/mirror
-#url = ${buildout:directory}/thirdparty/php-5.3.8.tar.gz
+#url = http://us3.php.net/get/php-5.3.8.tar.gz/from/ua.php.net/mirror
pre-make-hook = ${buildout:directory}/thirdparty/patches/php/makefile.py:main
+# use system libiconv
+environment =
+ LIBS=/usr/lib/libiconv.dylib
configure-options =
--prefix=${buildout:directory}/parts/php-${php:version}
--enable-cli
@@ -172,9 +165,8 @@ configure-options =
--with-gd
--enable-gd-native-ttf
--with-jpeg-dir=${buildout:directory}/parts/jpeg
- --with-png-dir=${buildout:directory}/parts/png
+ --with-png-dir=${buildout:directory}/parts/png
--with-freetype-dir=${buildout:directory}/parts/freetype
- --with-iconv=${buildout:directory}/parts/libiconv
--with-curl=${buildout:directory}/parts/curl
--with-gettext=${buildout:directory}/parts/gettext
--with-config-file-path=${buildout:directory}/etc/
View
3 buildout.cfg
@@ -25,6 +25,9 @@ port = 3305
[php]
version = 5.3.8
url = http://us3.php.net/get/php-5.3.8.tar.gz/from/ua.php.net/mirror
+# Just uncomment these lines for php 5.2
+#version = 5.2.17
+#url = http://us3.php.net/get/php-5.2.17.tar.gz/from/ua.php.net/mirror
[apache-conf]

0 comments on commit eafe693

Please sign in to comment.