| 1 |
commit: cdbd2b4e08d33fa3b74dafab8b4a24da04beab03 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 27 10:01:53 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 27 10:04:48 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdbd2b4e |
| 7 |
|
| 8 |
net-misc/chrony: BDEPEND on virtual/pkgconfig |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 12 |
|
| 13 |
net-misc/chrony/chrony-3.5.1-r1.ebuild | 13 +++++++++++-- |
| 14 |
net-misc/chrony/chrony-4.0_pre3.ebuild | 13 +++++++++++-- |
| 15 |
net-misc/chrony/chrony-9999.ebuild | 13 +++++++++++-- |
| 16 |
3 files changed, 33 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/chrony/chrony-3.5.1-r1.ebuild b/net-misc/chrony/chrony-3.5.1-r1.ebuild |
| 19 |
index 84346525f5c..877718f6031 100644 |
| 20 |
--- a/net-misc/chrony/chrony-3.5.1-r1.ebuild |
| 21 |
+++ b/net-misc/chrony/chrony-3.5.1-r1.ebuild |
| 22 |
@@ -43,6 +43,9 @@ RDEPEND=" |
| 23 |
${CDEPEND} |
| 24 |
selinux? ( sec-policy/selinux-chronyd ) |
| 25 |
" |
| 26 |
+BDEPEND=" |
| 27 |
+ nettle? ( virtual/pkgconfig ) |
| 28 |
+" |
| 29 |
PATCHES=( |
| 30 |
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch |
| 31 |
"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch |
| 32 |
@@ -50,7 +53,7 @@ PATCHES=( |
| 33 |
S="${WORKDIR}/${P/_/-}" |
| 34 |
|
| 35 |
if [[ ${PV} == "9999" ]]; then |
| 36 |
- BDEPEND=" virtual/w3m" |
| 37 |
+ BDEPEND+=" virtual/w3m" |
| 38 |
fi |
| 39 |
|
| 40 |
src_prepare() { |
| 41 |
@@ -60,6 +63,10 @@ src_prepare() { |
| 42 |
-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ |
| 43 |
doc/* examples/* || die |
| 44 |
|
| 45 |
+ sed -i \ |
| 46 |
+ -e 's|pkg-config|${PKG_CONFIG}|g' \ |
| 47 |
+ configure || die |
| 48 |
+ |
| 49 |
# Copy for potential user fixup |
| 50 |
cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf |
| 51 |
cp examples/chronyd.service "${T}"/chronyd.service |
| 52 |
@@ -79,7 +86,7 @@ src_configure() { |
| 53 |
"${T}"/chronyd.conf "${T}"/chronyd.service || die |
| 54 |
fi |
| 55 |
|
| 56 |
- tc-export CC |
| 57 |
+ tc-export CC PKG_CONFIG |
| 58 |
|
| 59 |
local CHRONY_EDITLINE |
| 60 |
# ./configure legend: |
| 61 |
@@ -93,6 +100,8 @@ src_configure() { |
| 62 |
CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" |
| 63 |
fi |
| 64 |
|
| 65 |
+ # Note: ncurses and nss switches are mentioned in the configure script but |
| 66 |
+ # do nothing |
| 67 |
# not an autotools generated script |
| 68 |
local myconf=( |
| 69 |
$(use_enable seccomp scfilter) |
| 70 |
|
| 71 |
diff --git a/net-misc/chrony/chrony-4.0_pre3.ebuild b/net-misc/chrony/chrony-4.0_pre3.ebuild |
| 72 |
index 84346525f5c..877718f6031 100644 |
| 73 |
--- a/net-misc/chrony/chrony-4.0_pre3.ebuild |
| 74 |
+++ b/net-misc/chrony/chrony-4.0_pre3.ebuild |
| 75 |
@@ -43,6 +43,9 @@ RDEPEND=" |
| 76 |
${CDEPEND} |
| 77 |
selinux? ( sec-policy/selinux-chronyd ) |
| 78 |
" |
| 79 |
+BDEPEND=" |
| 80 |
+ nettle? ( virtual/pkgconfig ) |
| 81 |
+" |
| 82 |
PATCHES=( |
| 83 |
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch |
| 84 |
"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch |
| 85 |
@@ -50,7 +53,7 @@ PATCHES=( |
| 86 |
S="${WORKDIR}/${P/_/-}" |
| 87 |
|
| 88 |
if [[ ${PV} == "9999" ]]; then |
| 89 |
- BDEPEND=" virtual/w3m" |
| 90 |
+ BDEPEND+=" virtual/w3m" |
| 91 |
fi |
| 92 |
|
| 93 |
src_prepare() { |
| 94 |
@@ -60,6 +63,10 @@ src_prepare() { |
| 95 |
-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ |
| 96 |
doc/* examples/* || die |
| 97 |
|
| 98 |
+ sed -i \ |
| 99 |
+ -e 's|pkg-config|${PKG_CONFIG}|g' \ |
| 100 |
+ configure || die |
| 101 |
+ |
| 102 |
# Copy for potential user fixup |
| 103 |
cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf |
| 104 |
cp examples/chronyd.service "${T}"/chronyd.service |
| 105 |
@@ -79,7 +86,7 @@ src_configure() { |
| 106 |
"${T}"/chronyd.conf "${T}"/chronyd.service || die |
| 107 |
fi |
| 108 |
|
| 109 |
- tc-export CC |
| 110 |
+ tc-export CC PKG_CONFIG |
| 111 |
|
| 112 |
local CHRONY_EDITLINE |
| 113 |
# ./configure legend: |
| 114 |
@@ -93,6 +100,8 @@ src_configure() { |
| 115 |
CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" |
| 116 |
fi |
| 117 |
|
| 118 |
+ # Note: ncurses and nss switches are mentioned in the configure script but |
| 119 |
+ # do nothing |
| 120 |
# not an autotools generated script |
| 121 |
local myconf=( |
| 122 |
$(use_enable seccomp scfilter) |
| 123 |
|
| 124 |
diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild |
| 125 |
index 84346525f5c..877718f6031 100644 |
| 126 |
--- a/net-misc/chrony/chrony-9999.ebuild |
| 127 |
+++ b/net-misc/chrony/chrony-9999.ebuild |
| 128 |
@@ -43,6 +43,9 @@ RDEPEND=" |
| 129 |
${CDEPEND} |
| 130 |
selinux? ( sec-policy/selinux-chronyd ) |
| 131 |
" |
| 132 |
+BDEPEND=" |
| 133 |
+ nettle? ( virtual/pkgconfig ) |
| 134 |
+" |
| 135 |
PATCHES=( |
| 136 |
"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch |
| 137 |
"${FILESDIR}"/${PN}-3.5-r3-systemd-gentoo.patch |
| 138 |
@@ -50,7 +53,7 @@ PATCHES=( |
| 139 |
S="${WORKDIR}/${P/_/-}" |
| 140 |
|
| 141 |
if [[ ${PV} == "9999" ]]; then |
| 142 |
- BDEPEND=" virtual/w3m" |
| 143 |
+ BDEPEND+=" virtual/w3m" |
| 144 |
fi |
| 145 |
|
| 146 |
src_prepare() { |
| 147 |
@@ -60,6 +63,10 @@ src_prepare() { |
| 148 |
-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \ |
| 149 |
doc/* examples/* || die |
| 150 |
|
| 151 |
+ sed -i \ |
| 152 |
+ -e 's|pkg-config|${PKG_CONFIG}|g' \ |
| 153 |
+ configure || die |
| 154 |
+ |
| 155 |
# Copy for potential user fixup |
| 156 |
cp "${FILESDIR}"/chronyd.conf-r1 "${T}"/chronyd.conf |
| 157 |
cp examples/chronyd.service "${T}"/chronyd.service |
| 158 |
@@ -79,7 +86,7 @@ src_configure() { |
| 159 |
"${T}"/chronyd.conf "${T}"/chronyd.service || die |
| 160 |
fi |
| 161 |
|
| 162 |
- tc-export CC |
| 163 |
+ tc-export CC PKG_CONFIG |
| 164 |
|
| 165 |
local CHRONY_EDITLINE |
| 166 |
# ./configure legend: |
| 167 |
@@ -93,6 +100,8 @@ src_configure() { |
| 168 |
CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)" |
| 169 |
fi |
| 170 |
|
| 171 |
+ # Note: ncurses and nss switches are mentioned in the configure script but |
| 172 |
+ # do nothing |
| 173 |
# not an autotools generated script |
| 174 |
local myconf=( |
| 175 |
$(use_enable seccomp scfilter) |
Archives