From e43e3291483699ac117030c4f57116ad8fe3b961 Mon Sep 17 00:00:00 2001
From: Boud Roukema <boud@cosmo.torun.pl>
Date: Mon, 27 Apr 2020 17:08:36 +0200
Subject: Configration bug fixed: identify pkg-config from its tarball name
Until Commit 3409a54 (from yesterday), pkg-config was found correctly in
`reproduce/software/make/basic.mk` by searching for `pkg`. However, commit
a21ea20 made an improvement in the regular expression for relating package
names and download filenames, and the string `pkg-config` with the new
regex no longer simplifies to `pkg`. The result of this was that the
basic.mk could not find `pkg-config` in the list of packages, since it was
still listed as `pkg`. This blocked downloading for a system without
pkg-config preloaded.
With this commit (of just a few bytes), the bug is fixed.
---
reproduce/software/make/basic.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'reproduce/software')
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk
index ebcd9b1..79411d2 100644
--- a/reproduce/software/make/basic.mk
+++ b/reproduce/software/make/basic.mk
@@ -200,7 +200,7 @@ $(tarballs): $(tdir)/%: | $(lockdir)
c=$(perl-checksum); \
v=$$(echo $(perl-version) | sed -e's/\./ /g' | awk '{printf("%d.0", $$1)}'); \
w=https://www.cpan.org/src/$$v; \
- elif [ $$n = pkg ]; then c=$(pkgconfig-checksum); w=http://pkg-config.freedesktop.org/releases; \
+ elif [ $$n = pkg-config ]; then c=$(pkgconfig-checksum); w=http://pkg-config.freedesktop.org/releases; \
elif [ $$n = readline ]; then c=$(readline-checksum); w=http://ftp.gnu.org/gnu/readline; \
elif [ $$n = sed ]; then c=$(sed-checksum); w=http://ftp.gnu.org/gnu/sed; \
elif [ $$n = tar ]; then c=$(tar-checksum); w=http://ftp.gnu.org/gnu/tar; \
--
cgit v1.2.1