| 1 |
commit: 742fa9e975964c8b9fce47b1372eeae003e62dec |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 13 22:40:51 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 14 00:08:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=742fa9e9 |
| 7 |
|
| 8 |
gkbuild.sh: gkconf(): Update config.{guess,sub} with /usr/share/gnuconfig when possible |
| 9 |
|
| 10 |
This will help to avoid build failures. |
| 11 |
|
| 12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 13 |
|
| 14 |
worker_modules/gkbuild.sh | 15 +++++++++++++++ |
| 15 |
1 file changed, 15 insertions(+) |
| 16 |
|
| 17 |
diff --git a/worker_modules/gkbuild.sh b/worker_modules/gkbuild.sh |
| 18 |
index 2c23386..601d052 100644 |
| 19 |
--- a/worker_modules/gkbuild.sh |
| 20 |
+++ b/worker_modules/gkbuild.sh |
| 21 |
@@ -642,6 +642,21 @@ gkconf() { |
| 22 |
: ${GKCONF_SOURCE:=.} |
| 23 |
if [ -x "${GKCONF_SOURCE}/configure" ] |
| 24 |
then |
| 25 |
+ local pid=${BASHPID} |
| 26 |
+ local x |
| 27 |
+ |
| 28 |
+ if [ -e "/usr/share/gnuconfig/" ] |
| 29 |
+ then |
| 30 |
+ find "${WORKDIR}" -type f '(' \ |
| 31 |
+ -name config.guess -o -name config.sub ')' -print0 | \ |
| 32 |
+ while read -r -d $'\0' x ; do |
| 33 |
+ print_info 3 "$(get_indent 2)${P}: >> Updating ${x/${WORKDIR}\/} with /usr/share/gnuconfig/${x##*/} ..." |
| 34 |
+ # Make sure we do this atomically incase we're run in parallel. #487478 |
| 35 |
+ cp -f /usr/share/gnuconfig/"${x##*/}" "${x}.${pid}" |
| 36 |
+ mv -f "${x}.${pid}" "${x}" |
| 37 |
+ done |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
local -a conf_args=() |
| 41 |
local conf_help=$("${GKCONF_SOURCE}/configure" --help 2>/dev/null) |
Archives