diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2017-07-26 11:28:18 -0400 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2017-07-26 11:57:35 -0400 |
| commit | 288b21920a83731a4c08c541ba5f73544c850f04 (patch) | |
| tree | 33ae9cfb9b952fe4beb2bffce040994969b70ddc /app-eselect/eselect-php | |
| parent | app-eselect/eselect-php: new version 0.9.3. (diff) | |
| download | gentoo-288b21920a83731a4c08c541ba5f73544c850f04.tar.gz gentoo-288b21920a83731a4c08c541ba5f73544c850f04.tar.bz2 gentoo-288b21920a83731a4c08c541ba5f73544c850f04.zip | |
app-eselect/eselect-php: update the live ebuild for recent repo changes.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'app-eselect/eselect-php')
| -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() { |