1 |
Dnia 11 grudnia 2015 22:03:03 CET, dilfridge@g.o napisał(a): |
2 |
>From: Andreas K. Hüttel <dilfridge@g.o> |
3 |
> |
4 |
>--- |
5 |
> eclass/perl-module.eclass | 16 +++++++++++----- |
6 |
> 1 file changed, 11 insertions(+), 5 deletions(-) |
7 |
> |
8 |
>diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass |
9 |
>index 6a5f2ff..7434bcf 100644 |
10 |
>--- a/eclass/perl-module.eclass |
11 |
>+++ b/eclass/perl-module.eclass |
12 |
>@@ -102,12 +102,18 @@ esac |
13 |
> |
14 |
> LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}" |
15 |
> |
16 |
>-if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then |
17 |
>- : ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}} |
18 |
>- S=${MY_S:-${WORKDIR}/${MY_P}} |
19 |
>+if [[ ${EAPI:-0} = 5 ]] ; then |
20 |
>+ if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then |
21 |
>+ : ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}} |
22 |
>+ S=${MY_S:-${WORKDIR}/${MY_P}} |
23 |
>+ fi |
24 |
>+ MODULE_NAME=${MY_PN:-${PN}} |
25 |
>+ MODULE_P=${MY_P:-${P}} |
26 |
>+else |
27 |
>+ MODULE_NAME=${MODULE_NAME:-${PN}} |
28 |
>+ MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}} |
29 |
>+ S=${WORKDIR}/${MODULE_P} |
30 |
> fi |
31 |
>-MODULE_NAME=${MY_PN:-${PN}} |
32 |
>-MODULE_P=${MY_P:-${P}} |
33 |
> |
34 |
> [[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \ |
35 |
> MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}" |
36 |
|
37 |
How likely is it that one would use MY_* without MODULE_*? Maybe it would be good to warn about this? |
38 |
-- |
39 |
Sent from my Android device with K-9 Mail. Please excuse my brevity. |