summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2017-01-03 16:05:41 +0100
committerFabian Groffen <grobian@gentoo.org>2017-01-03 16:05:56 +0100
commit071b6bc3a32cf9557fa153b0097e5fd0cf887a0c (patch)
tree32ce06240b51c5467fe60202d27665144593ff09 /dev-libs/cyrus-sasl
parentkde-misc/plasma-applet-weather-widget: Remove 1.6.7 (diff)
downloadgentoo-071b6bc3a32cf9557fa153b0097e5fd0cf887a0c.tar.gz
gentoo-071b6bc3a32cf9557fa153b0097e5fd0cf887a0c.tar.bz2
gentoo-071b6bc3a32cf9557fa153b0097e5fd0cf887a0c.zip
dev-libs/cyrus-sasl: add fixes for Prefix platforms at runtime
Package-Manager: portage-2.2.28-prefix
Diffstat (limited to 'dev-libs/cyrus-sasl')
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild12
1 files changed, 8 insertions, 4 deletions
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
index a13cf7932d0..703bfa1dea3 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -165,7 +165,7 @@ multilib_src_configure() {
$(use_enable kerberos gssapi) \
$(multilib_native_use_enable java) \
$(multilib_native_use_with java javahome ${JAVA_HOME}) \
- $(multilib_native_use_with mysql mysql /usr) \
+ $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr) \
$(multilib_native_use_with postgres pgsql) \
$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir)) \
$(use_enable srp) \
@@ -197,7 +197,7 @@ multilib_src_install() {
# Default location for java classes breaks OpenOffice (bug #60769).
if use java; then
java-pkg_dojar ${PN}.jar
- java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl.so"
+ java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
# hackish, don't wanna dig through makefile
rm -rf "${ED}/usr/$(get_libdir)/java" || die
docinto "java"
@@ -231,7 +231,11 @@ multilib_src_install_all() {
systemd_dounit "${FILESDIR}/saslauthd.service"
systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
- prune_libtool_files --modules
+ # The get_modname bit is important: do not remove the .la files on
+ # platforms where the lib isn't called .so for cyrus searches the .la to
+ # figure out what the name is supposed to be instead
+ use static-libs || [[ $(get_modname) != .so ]] || \
+ prune_libtool_files --modules
}
pkg_postinst () {