Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=php52.git;a=commitdiff;h=9e9fc4edaba4dc51180d05c2cb96a4492dc1dd5d
commit 9e9fc4edaba4dc51180d05c2cb96a4492dc1dd5d Author: CSÉCSY László <boo...@frugalware.org> Date: Wed Nov 9 23:07:10 2011 +0100 php-5.2.17-4-x86_64 rebuilt with newer -stable oh man, should php really be this complicated/fragile? :S diff --git a/source/devel/php/FrugalBuild b/source/devel/php/FrugalBuild index 2b01c4f..72ceff0 100644 --- a/source/devel/php/FrugalBuild +++ b/source/devel/php/FrugalBuild @@ -4,7 +4,7 @@ pkgname=php pkgver=5.2.17 -pkgrel=2 +pkgrel=4 pkgdesc="A widely-used general-purpose scripting language" url="http://www.php.net"; backup=(etc/{php.ini,httpd/conf/modules.d/$pkgname.conf}) @@ -18,7 +18,7 @@ archs=('i686' 'x86_64') _F_archive_grepv="5\.3" up2date="Flasttar http://www.php.net/downloads.php"; source=(http://www.php.net/distributions/$pkgname-$pkgver.tar.gz \ - php.ini php.conf README.Frugalware phpize.in.patch) + php.ini php.conf README.Frugalware phpize.in.patch php-5.2.17-pear_must_die.patch) subpkgs=("$pkgname-cgi") suboptions=('nodocs') ## its depends on PHP and the same files are installed etc @@ -66,7 +66,7 @@ build() --with-jpeg-dir=/usr \ --with-mcrypt=shared,/usr \ --with-mysql=shared,/usr \ - --with-mysql-sock=/tmp/mysql.sock \ + --with-mysql-sock=/var/run/mysql/mysqld.sock \ --with-openssl \ --with-gettext \ --with-pear=/usr/share/pear \ @@ -107,11 +107,12 @@ build() --enable-discard-path \ --enable-force-cgi-redirect make ${JOBS} || Fdie - make INSTALL_ROOT=$Fdestdir EXTENSION_DIR=/usr/lib/php PEAR_INSTALLDIR=/usr/share/pear install || Fdie + make INSTALL_ROOT=$Fdestdir EXTENSION_DIR=/usr/lib/php PEAR_INSTALLDIR=$Fdestdir/usr/share/pear install || Fdie ## remove stuff is in php Fcd $Fdestdir Frm etc ./{.registry,.channels,.depdb*,.lock,.file*} usr/{include,share,lib,man} usr/php/man Frm usr/bin/{phpize,php-config,pecl,pear*,php} + Frm var ## yeah mv because Fdoc will not work ## and if I don't move it it will be installed in PHP build as well =) @@ -128,7 +129,11 @@ build() make ${JOBS} || Fdie Fmkdir usr/lib/apache Fsed "-i -a -n php5" "-i -n php5" Makefile - make INSTALL_ROOT=$Fdestdir EXTENSION_DIR=/usr/lib/php PEAR_INSTALLDIR=/usr/share/pear install || Fdie + make INSTALL_ROOT=$Fdestdir EXTENSION_DIR=/usr/lib/php PEAR_INSTALLDIR=$Fdestdir/usr/share/pear install || Fdie + Frm usr/share/pear + Fmv $Fdestdir/usr/share/pear usr/share/pear + Frm var + Fsed "$Fdestdir" "" $Fdestdir/usr/{bin/pear,share/pear/pearcmd.php} Ffile /etc/httpd/conf/modules.d/$pkgname.conf Ffile /etc/php.ini @@ -137,9 +142,10 @@ build() Fln /usr/share/aclocal/libtool.m4 /usr/lib/php/build/libtool.m4 } sha1sums=('5ba7edcb5ea187687001c4ccdbb94ac48f77fa92' \ - '9ba6e9430bdba5f6ab2bad15e7cc354d0ea3fd58' \ + '8340ffe796dc58ed6a29a3b03d4f1e19f2ed1990' \ '0850ef23512a02e8460dc36f08f453d148dcd9df' \ '40ae88f0721e02a2c75de76be342c51c85bf734d' \ - '4c598e1c8683518090f7a0e9fef01c57593137c8') + '4c598e1c8683518090f7a0e9fef01c57593137c8' \ + 'bb6a4ed612b484dd7f9187ab32b4e3deec1b2c5a') # optimization OK diff --git a/source/devel/php/php-5.2.17-pear_must_die.patch b/source/devel/php/php-5.2.17-pear_must_die.patch new file mode 100644 index 0000000..1bc8a6d --- /dev/null +++ b/source/devel/php/php-5.2.17-pear_must_die.patch @@ -0,0 +1,31 @@ +diff -Naur php-5.2.17-orig/pear/Makefile.frag php-5.2.17/pear/Makefile.frag +--- php-5.2.17-orig/pear/Makefile.frag 2009-08-02 21:11:15.000000000 +0200 ++++ php-5.2.17/pear/Makefile.frag 2011-11-09 16:47:40.584672973 +0100 +@@ -3,7 +3,7 @@ + peardir=$(PEAR_INSTALLDIR) + + # Skip all php.ini files altogether +-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 ++PEAR_INSTALL_FLAGS = -n -dphp_dir=$(INSTALL_ROOT)$(peardir) -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=1803 -dmemory_limit=-1 -ddetect_unicode=0 + + WGET = `which wget 2>/dev/null` + FETCH = `which fetch 2>/dev/null` +@@ -11,7 +11,8 @@ + PEAR_SUFFIX = -ds a$(program_suffix) + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} ++ @echo "Installing PEAR via phar: $(INSTALL_ROOT)/" ++ $(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" +@@ -29,7 +30,7 @@ + fi \ + fi + @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ +- $(MAKE) -s install-pear-installer; \ ++ $(MAKE) -s install-pear-installer; INSTALL_ROOT=$(INSTALL_ROOT); \ + else \ + cat $(srcdir)/install-pear.txt; \ + fi diff --git a/source/devel/php/php.ini b/source/devel/php/php.ini index 86755ab..1088138 100644 --- a/source/devel/php/php.ini +++ b/source/devel/php/php.ini @@ -542,7 +542,8 @@ mysql.default_port = ; Default socket name for local MySQL connects. If empty, uses the built-in ; MySQL defaults. -mysql.default_socket = +mysql.default_socket = /var/run/mysql/mysqld.sock +mysqli.default_socket = /var/run/mysql/mysqld.sock ; Default host for mysql_connect() (doesn't apply in safe mode). mysql.default_host =
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
