[gentoo-commits] gentoo-x86 commit in dev-lang/php/files/eblits: src_configure-v3.eblit src_install-v3.eblit

[Ole Markus With (olemarkus)]

olemarkus    11/06/30 07:30:11

  Modified:             src_configure-v3.eblit
  Added:                src_install-v3.eblit
  Log:
  Removed support for sqlite and sharedext in php 5.4. Also removed reference to birdstep
  
  (Portage version: 2.1.10.3/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-lang/php/files/eblits/src_configure-v3.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit?r1=1.1&r2=1.2

Index: src_configure-v3.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src_configure-v3.eblit	29 Jun 2011 06:38:38 -0000	1.1
+++ src_configure-v3.eblit	30 Jun 2011 07:30:11 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit,v 1.1 2011/06/29 06:38:38 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit,v 1.2 2011/06/30 07:30:11 olemarkus Exp $
 
 eblit-php-src_configure() {
 	PHP_DESTDIR="/usr/$(get_libdir)/php${SLOT}"
@@ -183,14 +183,6 @@
 		phpconfutils_extension_disable "session" "session" 0
 	fi
 
-	# SQLite support
-	if use sqlite ; then
-		phpconfutils_extension_with   "sqlite"      "sqlite"  0 "/usr"
-		phpconfutils_extension_enable "sqlite-utf8" "unicode" 0
-	else
-		phpconfutils_extension_without "sqlite" "sqlite" 0
-	fi
-
 	if use pic ; then
 		my_conf="${my_conf} --with-pic"
 	fi



1.1                  dev-lang/php/files/eblits/src_install-v3.eblit

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit?rev=1.1&content-type=text/plain

Index: src_install-v3.eblit
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.1 2011/06/30 07:30:11 olemarkus Exp $

eblit-php-src_install() {
	# see bug #324739 for what happens when we don't have that
	addpredict /usr/share/snmp/mibs/.index

	# grab the first SAPI that got built and install common files from there
	local first_sapi=""
	for sapi in $SAPIS ; do
		if use $sapi ; then
			first_sapi=$sapi
			break
		fi
	done

	# Makefile forgets to create this before trying to write to it...
	dodir "${PHP_DESTDIR}/bin"

	# Install php environment (without any sapis)
	cd "${WORKDIR}/sapis-build/$first_sapi"
	emake INSTALL_ROOT="${D}" \
		install-build install-headers install-programs \
		|| die "emake install failed"

	local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)"

	# Generate the USE file for PHP
	phpconfutils_generate_usefile

	# Create the directory where we'll put version-specific php scripts
	keepdir /usr/share/php${PHP_MV}

	local sapi="", file=""
	local sapi_list=""

	for sapi in ${SAPIS}; do
		if use "${sapi}" ; then
			einfo "Installing SAPI: ${sapi}"
			cd "${WORKDIR}/sapis-build/${sapi}"
			# needed each time, php_install_ini would reset it
			into "${PHP_DESTDIR}"
			file=$(find "${SAPI_DIR}/${sapi}/" -type f | head -n 1)

			if [[ "${file: -3}" == ".so" ]]; then 
				if [[ "${sapi}" == "apache2" ]]; then
					insinto "${PHP_DESTDIR}/apache2/"
					newins "${file}" "${file/*\/}"
                    keepdir "/usr/$(get_libdir)/apache2/modules"
				else
					dolib.so "${file}" || die "Unable to install ${sapi} sapi"
				fi
			else
				dobin "${file}" || die "Unable to install ${sapi} sapi"
			fi

			php_install_ini "${sapi}"

			# construct correct SAPI string for php-config
			# thanks to ferringb for the bash voodoo
			if [[ "${sapi}" == "apache2" ]]; then
			    sapi_list="${sapi_list:+${sapi_list} }apache2handler"
			else
				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
			fi
		fi
	done

	# Install env.d files
	newenvd "${FILESDIR}/20php5-envd" \
		"20php${SLOT}"
	sed -e "s|/lib/|/$(get_libdir)/|g" -i \
		"${D}/etc/env.d/20php${SLOT}"
	sed -e "s|php5|php${SLOT}|g" -i \
		"${D}/etc/env.d/20php${SLOT}"

	# set php-config variable correctly (bug #278439)
	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
		"${D}/usr/$(get_libdir)/php${SLOT}/bin/php-config"
}

php_install_ini() {
	local phpsapi="${1}"

	# work out where we are installing the ini file
	php_set_ini_dir "${phpsapi}"

	local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}"
	cp "${PHP_INI_UPSTREAM}" "${phpinisrc}"

	# default to allow_url_open=Off, bug 332763
	sed -e 's|^allow_url_fopen .*|allow_url_fopen = Off|g' -i "${phpinisrc}"

	# default to expose_php=Off, bug 300695
	sed -e 's|^expose_php .*|expose_php = Off|g' -i "${phpinisrc}"

	# default to /tmp for save_path, bug #282768
	sed -e 's|^;session.save_path .*$|session.save_path = "/tmp"|g' -i "${phpinisrc}"

	# Set the extension dir
	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}"

	# Set the include path to point to where we want to find PEAR packages
	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:/usr/share/php'${PHP_MV}':/usr/share/php"|' -i "${phpinisrc}"

	dodir "${PHP_INI_DIR}"
	insinto "${PHP_INI_DIR}"
	newins "${phpinisrc}" "${PHP_INI_FILE}"

	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR}"
	elog

	dodir "${PHP_EXT_INI_DIR}"
	dodir "${PHP_EXT_INI_DIR_ACTIVE}"

	# SAPI-specific handling
	if [[ "${sapi}" == "apache2" ]] ; then
			insinto "${APACHE_MODULES_CONFDIR}"
			newins "${FILESDIR}/70_mod_php${PHP_MV}.conf-apache2" \
				"70_mod_php${PHP_MV}.conf"
	fi

	if [[ "${sapi}" == "fpm" ]] ; then
		einfo "Installing FPM CGI config file php-fpm.conf"
		insinto ${PHP_INI_DIR}
		doins "${FILESDIR}/php-fpm.conf"
		dodir "/etc/init.d"
		insinto "/etc/init.d"
		newinitd "${FILESDIR}/php-fpm-r3.init" "php-fpm"
		#dosym "${PHP_DESTDIR}/bin/php-fpm" "/usr/bin/php-fpm"
		
		# Remove bogus /etc/php-fpm.conf.default (bug 359906)
		[[ -f "${D}/etc/php-fpm.conf.default" ]] && rm "${D}/etc/php-fpm.conf.default"
	fi

  # Install PHP ini files into /usr/share/php
	if [[ ${SLOT} == '5.2' ]]; then
		newdoc php.ini-dist php.ini-development
		newdoc php.ini-recommended php.ini-production
	fi

	if [[ ${SLOT} == '5.3' ]]; then
		dodoc php.ini-development
		dodoc php.ini-production
	fi

}