| 1 |
commit: 53851d0721fd2ecce0bace26725d59397de34882 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 25 06:39:27 2019 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 26 07:36:04 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53851d07 |
| 7 |
|
| 8 |
net-misc/chrony: clean up configure arguments |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/695610 |
| 11 |
Package-Manager: Portage-2.3.75_p7, Repoman-2.3.17_p49 |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 14 |
|
| 15 |
net-misc/chrony/chrony-3.5.ebuild | 47 +++++++++++++++++++------------------- |
| 16 |
net-misc/chrony/chrony-9999.ebuild | 47 +++++++++++++++++++------------------- |
| 17 |
2 files changed, 46 insertions(+), 48 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-misc/chrony/chrony-3.5.ebuild b/net-misc/chrony/chrony-3.5.ebuild |
| 20 |
index 21c96f64215..c74eea646f9 100644 |
| 21 |
--- a/net-misc/chrony/chrony-3.5.ebuild |
| 22 |
+++ b/net-misc/chrony/chrony-3.5.ebuild |
| 23 |
@@ -66,34 +66,33 @@ src_configure() { |
| 24 |
fi |
| 25 |
|
| 26 |
# not an autotools generated script |
| 27 |
- local CHRONY_CONFIGURE=" |
| 28 |
- ./configure \ |
| 29 |
- $(use_enable seccomp scfilter) \ |
| 30 |
- $(usex adns '' --disable-asyncdns) \ |
| 31 |
- $(usex caps '' --disable-linuxcaps) \ |
| 32 |
- $(usex cmdmon '' --disable-cmdmon) \ |
| 33 |
- $(usex ipv6 '' --disable-ipv6) \ |
| 34 |
- $(usex ntp '' --disable-ntp) \ |
| 35 |
- $(usex phc '' --disable-phc) \ |
| 36 |
- $(usex pps '' --disable-pps) \ |
| 37 |
- $(usex refclock '' --disable-refclock) \ |
| 38 |
- $(usex rtc '' --disable-rtc) \ |
| 39 |
- ${CHRONY_EDITLINE} \ |
| 40 |
- ${EXTRA_ECONF} \ |
| 41 |
- --chronysockdir=/run/chrony \ |
| 42 |
- --disable-sechash \ |
| 43 |
- --docdir=/usr/share/doc/${PF} \ |
| 44 |
- --mandir=/usr/share/man \ |
| 45 |
- --prefix=/usr \ |
| 46 |
- --sysconfdir=/etc/chrony \ |
| 47 |
+ local myconf=( |
| 48 |
+ $(use_enable seccomp scfilter) |
| 49 |
+ $(usex adns '' --disable-asyncdns) |
| 50 |
+ $(usex caps '' --disable-linuxcaps) |
| 51 |
+ $(usex cmdmon '' --disable-cmdmon) |
| 52 |
+ $(usex ipv6 '' --disable-ipv6) |
| 53 |
+ $(usex ntp '' --disable-ntp) |
| 54 |
+ $(usex phc '' --disable-phc) |
| 55 |
+ $(usex pps '' --disable-pps) |
| 56 |
+ $(usex refclock '' --disable-refclock) |
| 57 |
+ $(usex rtc '' --disable-rtc) |
| 58 |
+ ${CHRONY_EDITLINE} |
| 59 |
+ ${EXTRA_ECONF} |
| 60 |
+ --chronysockdir="${EPREFIX}/run/chrony" |
| 61 |
+ --disable-sechash |
| 62 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" |
| 63 |
+ --mandir="${EPREFIX}/usr/share/man" |
| 64 |
+ --prefix="${EPREFIX}/usr" |
| 65 |
+ --sysconfdir="${EPREFIX}/etc/chrony" |
| 66 |
--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" |
| 67 |
- --without-nss \ |
| 68 |
+ --without-nss |
| 69 |
--without-tomcrypt |
| 70 |
- " |
| 71 |
+ ) |
| 72 |
|
| 73 |
# print the ./configure call to aid in future debugging |
| 74 |
- einfo ${CHRONY_CONFIGURE} |
| 75 |
- bash ${CHRONY_CONFIGURE} || die |
| 76 |
+ echo bash ./configure "${myconf[@]}" >&2 |
| 77 |
+ bash ./configure "${myconf[@]}" || die |
| 78 |
} |
| 79 |
|
| 80 |
src_compile() { |
| 81 |
|
| 82 |
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild |
| 83 |
index a9bf2fae278..53dd5de5b8a 100644 |
| 84 |
--- a/net-misc/chrony/chrony-9999.ebuild |
| 85 |
+++ b/net-misc/chrony/chrony-9999.ebuild |
| 86 |
@@ -64,34 +64,33 @@ src_configure() { |
| 87 |
fi |
| 88 |
|
| 89 |
# not an autotools generated script |
| 90 |
- local CHRONY_CONFIGURE=" |
| 91 |
- ./configure \ |
| 92 |
- $(use_enable seccomp scfilter) \ |
| 93 |
- $(usex adns '' --disable-asyncdns) \ |
| 94 |
- $(usex caps '' --disable-linuxcaps) \ |
| 95 |
- $(usex cmdmon '' --disable-cmdmon) \ |
| 96 |
- $(usex ipv6 '' --disable-ipv6) \ |
| 97 |
- $(usex ntp '' --disable-ntp) \ |
| 98 |
- $(usex phc '' --disable-phc) \ |
| 99 |
- $(usex pps '' --disable-pps) \ |
| 100 |
- $(usex refclock '' --disable-refclock) \ |
| 101 |
- $(usex rtc '' --disable-rtc) \ |
| 102 |
- ${CHRONY_EDITLINE} \ |
| 103 |
- ${EXTRA_ECONF} \ |
| 104 |
- --chronysockdir=/run/chrony \ |
| 105 |
- --disable-sechash \ |
| 106 |
- --docdir=/usr/share/doc/${PF} \ |
| 107 |
- --mandir=/usr/share/man \ |
| 108 |
- --prefix=/usr \ |
| 109 |
- --sysconfdir=/etc/chrony \ |
| 110 |
+ local myconf=( |
| 111 |
+ $(use_enable seccomp scfilter) |
| 112 |
+ $(usex adns '' --disable-asyncdns) |
| 113 |
+ $(usex caps '' --disable-linuxcaps) |
| 114 |
+ $(usex cmdmon '' --disable-cmdmon) |
| 115 |
+ $(usex ipv6 '' --disable-ipv6) |
| 116 |
+ $(usex ntp '' --disable-ntp) |
| 117 |
+ $(usex phc '' --disable-phc) |
| 118 |
+ $(usex pps '' --disable-pps) |
| 119 |
+ $(usex refclock '' --disable-refclock) |
| 120 |
+ $(usex rtc '' --disable-rtc) |
| 121 |
+ ${CHRONY_EDITLINE} |
| 122 |
+ ${EXTRA_ECONF} |
| 123 |
+ --chronysockdir="${EPREFIX}/run/chrony" |
| 124 |
+ --disable-sechash |
| 125 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" |
| 126 |
+ --mandir="${EPREFIX}/usr/share/man" |
| 127 |
+ --prefix="${EPREFIX}/usr" |
| 128 |
+ --sysconfdir="${EPREFIX}/etc/chrony" |
| 129 |
--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid" |
| 130 |
- --without-nss \ |
| 131 |
+ --without-nss |
| 132 |
--without-tomcrypt |
| 133 |
- " |
| 134 |
+ ) |
| 135 |
|
| 136 |
# print the ./configure call to aid in future debugging |
| 137 |
- einfo ${CHRONY_CONFIGURE} |
| 138 |
- bash ${CHRONY_CONFIGURE} || die |
| 139 |
+ echo bash ./configure "${myconf[@]}" >&2 |
| 140 |
+ bash ./configure "${myconf[@]}" || die |
| 141 |
} |
| 142 |
|
| 143 |
src_compile() { |
Archives