| 1 |
commit: 071b6bc3a32cf9557fa153b0097e5fd0cf887a0c |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 3 15:05:41 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 3 15:05:56 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=071b6bc3 |
| 7 |
|
| 8 |
dev-libs/cyrus-sasl: add fixes for Prefix platforms at runtime |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28-prefix |
| 11 |
|
| 12 |
dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild | 12 ++++++++---- |
| 13 |
1 file changed, 8 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
index a13cf79..703bfa1 100644 |
| 17 |
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild |
| 18 |
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r11.ebuild |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2016 Gentoo Foundation |
| 21 |
+# Copyright 1999-2017 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
# $Id$ |
| 24 |
|
| 25 |
@@ -165,7 +165,7 @@ multilib_src_configure() { |
| 26 |
$(use_enable kerberos gssapi) \ |
| 27 |
$(multilib_native_use_enable java) \ |
| 28 |
$(multilib_native_use_with java javahome ${JAVA_HOME}) \ |
| 29 |
- $(multilib_native_use_with mysql mysql /usr) \ |
| 30 |
+ $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr) \ |
| 31 |
$(multilib_native_use_with postgres pgsql) \ |
| 32 |
$(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir)) \ |
| 33 |
$(use_enable srp) \ |
| 34 |
@@ -197,7 +197,7 @@ multilib_src_install() { |
| 35 |
# Default location for java classes breaks OpenOffice (bug #60769). |
| 36 |
if use java; then |
| 37 |
java-pkg_dojar ${PN}.jar |
| 38 |
- java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl.so" |
| 39 |
+ java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)" |
| 40 |
# hackish, don't wanna dig through makefile |
| 41 |
rm -rf "${ED}/usr/$(get_libdir)/java" || die |
| 42 |
docinto "java" |
| 43 |
@@ -231,7 +231,11 @@ multilib_src_install_all() { |
| 44 |
systemd_dounit "${FILESDIR}/saslauthd.service" |
| 45 |
systemd_dotmpfilesd "${FILESDIR}/${PN}.conf" |
| 46 |
|
| 47 |
- prune_libtool_files --modules |
| 48 |
+ # The get_modname bit is important: do not remove the .la files on |
| 49 |
+ # platforms where the lib isn't called .so for cyrus searches the .la to |
| 50 |
+ # figure out what the name is supposed to be instead |
| 51 |
+ use static-libs || [[ $(get_modname) != .so ]] || \ |
| 52 |
+ prune_libtool_files --modules |
| 53 |
} |
| 54 |
|
| 55 |
pkg_postinst () { |
Archives