diff options
| -rw-r--r-- | .file-metadata | bin | 6236 -> 6236 bytes | |||
| -rw-r--r-- | reproduce/software/make/basic.mk | 8 |
2 files changed, 8 insertions, 0 deletions
diff --git a/.file-metadata b/.file-metadata Binary files differindex ae36840..0411382 100644 --- a/.file-metadata +++ b/.file-metadata diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index f0083d6..0258014 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -966,6 +966,14 @@ $(ibidir)/mpfr: $(tdir)/mpfr-$(mpfr-version).tar.xz \ $(ibidir)/pkg-config: $(tdir)/pkg-config-$(pkgconfig-version).tar.gz \ $(ibidir)/coreutils + # An existing `libiconv' can cause a conflict with `pkg-config', + # this is why `libiconv' depends on `pkg-config'. On a clean build, + # `pkg-config' is built first. But when we don't have a clean build + # (and `libiconv' exists) there will be a problem. So before + # re-building `pkg-config', we'll remove any installation of + # `libiconv'. + rm -f $(ildir)/libiconv* + # Some Mac OS systems may have a version of the GNU C Compiler # (GCC) installed that doesn't support some necessary features of # building Glib (as part of pkg-config). So to be safe, for Mac |