diff options
| author |   Sam James <sam@gentoo.org> | 2021-05-07 13:58:25 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-05-07 14:38:00 +0000 |
| commit | 33f62c77eb8f4c280cf80a1e8cc8f8815055b2e4 (patch) | |
| tree | 314d0a98173c925de3451c02420d3db7523e6fb8 /net-mail | |
| parent | games-util/grfcodec: add github remote-id (diff) | |
| download | gentoo-33f62c77eb8f4c280cf80a1e8cc8f8815055b2e4.tar.gz gentoo-33f62c77eb8f4c280cf80a1e8cc8f8815055b2e4.tar.bz2 gentoo-33f62c77eb8f4c280cf80a1e8cc8f8815055b2e4.zip | |
net-mail/cyrus-imapd: move append-ldflags from pkg_setup->src_configure
Has no place on non-source builds.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-mail')
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild | 13 | ||||
| -rw-r--r-- | net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild | 8 |
2 files changed, 10 insertions, 11 deletions
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild index 621e5456a13b..aa2bb2f6608b 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools flag-o-matic pam ssl-cert DESCRIPTION="The Cyrus IMAP Server" @@ -74,12 +75,7 @@ REQUIRED_USE=" # TODO: check underlinking for other libraries PATCHES=( "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" - ) - -pkg_setup() { - # https://bugs.gentoo.org/604466 - append-ldflags $(no-as-needed) -} +) src_prepare() { default @@ -104,10 +100,15 @@ src_prepare() { src_configure() { local myconf + + # https://bugs.gentoo.org/604466 + append-ldflags $(no-as-needed) + if use afs ; then myconf+=" --with-afs-libdir=/usr/$(get_libdir)" myconf+=" --with-afs-incdir=/usr/include/afs" fi + # sphinx is unmaintained and dead, bug #662944 econf \ --enable-unit-tests \ diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild index 3a9516d6cca9..e5c77cc15730 100644 --- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild +++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.0.ebuild @@ -73,11 +73,6 @@ REQUIRED_USE=" # "${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch" #) -pkg_setup() { - # https://bugs.gentoo.org/604466 - append-ldflags $(no-as-needed) -} - src_prepare() { default @@ -103,6 +98,9 @@ src_prepare() { src_configure() { local myconf + # https://bugs.gentoo.org/604466 + append-ldflags $(no-as-needed) + if use afs ; then myconf+=" --with-afs-libdir=/usr/$(get_libdir)" myconf+=" --with-afs-incdir=/usr/include/afs" |