diff options
| author |   Petr Vaněk <arkamar@atlas.cz> | 2023-04-03 13:14:21 +0200 |
|---|---|---|
| committer |   Florian Schmaus <flow@gentoo.org> | 2023-04-04 11:01:43 +0200 |
| commit | 6aff85369909ec04e1370741a006d65ca3827a01 (patch) | |
| tree | 0b9de61306b4601cba91393445139ff5f0606b69 /eclass/qmail.eclass | |
| parent | sys-devel/bmake: add 20230321 (diff) | |
| download | gentoo-6aff85369909ec04e1370741a006d65ca3827a01.tar.gz gentoo-6aff85369909ec04e1370741a006d65ca3827a01.tar.bz2 gentoo-6aff85369909ec04e1370741a006d65ca3827a01.zip | |
qmail.eclass: Patch make-makelib.sh only if it is present
Some packages use qmail_set_cc function but they don't contain
make-makelib.sh script. However, recent addition of || die to the sed
patching this file is newly triggering build failure. This commit
addresses the problem by checking if the script is available.
Closes: https://bugs.gentoo.org/902009
Closes: https://bugs.gentoo.org/902019
Fixes: fd4e88c55e34 ("qmail.eclass: remove EAPI 6")
Closes: https://github.com/gentoo/gentoo/pull/30456
Closes: https://github.com/gentoo/gentoo/pull/30205
Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'eclass/qmail.eclass')
| -rw-r--r-- | eclass/qmail.eclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass index d527eb5f79d5..0e47aa55fa25 100644 --- a/eclass/qmail.eclass +++ b/eclass/qmail.eclass @@ -92,7 +92,12 @@ qmail_set_cc() { echo "${cc} ${CFLAGS} ${CPPFLAGS}" > ./conf-cc || die 'Patching conf-cc failed.' echo "${ld} ${LDFLAGS}" > ./conf-ld || die 'Patching conf-ld failed.' - sed -e "s#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i make-makelib.sh || die + + # This function is used also by sys-apps/ucspi-tcp and sys-process/daemontools-encore + # but they don't have make-makelib.sh script, see bugs #902009 and #902019 + if [[ -f make-makelib.sh ]]; then + sed -e "s#'ar #'$(tc-getAR) #" -e "s#'ranlib #'$(tc-getRANLIB) #" -i make-makelib.sh || die + fi } genqmail_src_unpack() { |