diff options
| -rw-r--r-- | app-eselect/eselect-php/eselect-php-9999.ebuild | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild index f32c4a68a2f6..7a707fb14809 100644 --- a/app-eselect/eselect-php/eselect-php-9999.ebuild +++ b/app-eselect/eselect-php/eselect-php-9999.ebuild @@ -16,8 +16,8 @@ IUSE="fpm apache2" # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. RDEPEND="app-admin/eselect - sys-apps/gentoo-functions - apache2? ( www-servers/apache[apache2_modules_dir] )" + apache2? ( www-servers/apache[apache2_modules_dir] ) + fpm? ( sys-apps/gentoo-functions )" src_prepare() { eapply_user @@ -28,7 +28,14 @@ src_configure(){ # We expect localstatedir to be "var"ish, not "var/lib"ish, because # that's what PHP upstream expects. See for example the FPM # configuration where they put logs in @localstatedir@/log. - econf --localstatedir="${EPREFIX}"/var $(use_enable apache2) $(use_enable fpm) + # + # The libdir is passed explicitly in case the /usr/lib symlink + # is not present (bug 624528). + econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --localstatedir="${EPREFIX}/var" \ + --with-piddir="${EPREFIX}/run" \ + $(use_enable apache2) \ + $(use_enable fpm) } src_install() { |