diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2016-09-28 23:30:19 +0200 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2016-09-28 23:30:19 +0200 |
| commit | bf71556d4a2b2c314ab9cd14468ed70f3eb7d2ba (patch) | |
| tree | bbadc7629408307b8095121cfc4f529e22c9a63b /app-misc | |
| parent | www-servers/resin: do not call get_libdir in global scope. (diff) | |
| download | gentoo-bf71556d4a2b2c314ab9cd14468ed70f3eb7d2ba.tar.gz gentoo-bf71556d4a2b2c314ab9cd14468ed70f3eb7d2ba.tar.bz2 gentoo-bf71556d4a2b2c314ab9cd14468ed70f3eb7d2ba.zip | |
app-misc/mosquitto: do not call get_libdir in global scope.
Gentoo-Bug: https://bugs.gentoo.org/593422
Package-Manager: portage-2.2.28
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/mosquitto/mosquitto-1.4.10.ebuild | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/app-misc/mosquitto/mosquitto-1.4.10.ebuild b/app-misc/mosquitto/mosquitto-1.4.10.ebuild index 15d5dd846825..b723fe381aa8 100644 --- a/app-misc/mosquitto/mosquitto-1.4.10.ebuild +++ b/app-misc/mosquitto/mosquitto-1.4.10.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI="5" PYTHON_COMPAT=( python2_7 ) inherit eutils systemd user python-any-r1 @@ -21,21 +21,13 @@ DEPEND="${RDEPEND} ${PYTHON_DEPS} srv? ( net-dns/c-ares )" -LIBDIR=$(get_libdir) -QA_PRESTRIPPED="/usr/sbin/mosquitto - /usr/bin/mosquitto_passwd - /usr/bin/mosquitto_sub - /usr/bin/mosquitto_pub - /usr/${LIBDIR}/libmosquittopp.so.1 - /usr/${LIBDIR}/libmosquitto.so.1" - pkg_setup() { enewgroup mosquitto enewuser mosquitto -1 -1 -1 mosquitto } src_prepare() { - epatch "${FILESDIR}/${PN}-1.4.9-conditional-tests.patch" + epatch "${FILESDIR}/${P}-conditional-tests.patch" if use persistence; then sed -i -e "s:^#autosave_interval:autosave_interval:" \ -e "s:^#persistence false$:persistence true:" \ @@ -48,6 +40,14 @@ src_prepare() { } src_configure() { + LIBDIR=$(get_libdir) + QA_PRESTRIPPED="/usr/sbin/mosquitto + /usr/bin/mosquitto_passwd + /usr/bin/mosquitto_sub + /usr/bin/mosquitto_pub + /usr/${LIBDIR}/libmosquittopp.so.1 + /usr/${LIBDIR}/libmosquitto.so.1" + makeopts=( "LIB_SUFFIX=${LIBDIR:3}" "WITH_BRIDGE=$(usex bridge)" @@ -56,7 +56,6 @@ src_configure() { "WITH_TLS=$(usex ssl)" "WITH_WRAP=$(usex tcpd)" ) - einfo "${makeopts[@]}" } src_compile() { |