diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-06-30 22:29:10 +0200 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2019-06-30 22:33:56 +0200 |
| commit | 5c30502334bb662645c4f857c0ddba0119d0d094 (patch) | |
| tree | d7163b534977b93d6697222c0eec8e73b1f62d61 /reproduce | |
| parent | c5295ede05177da29b67f45187d43658d9bc923f (diff) | |
Removing libiconv before building pkg-config
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.
With this commit, before re-building `pkg-config', we'll remove any
possibly existing installation of `libiconv'.
Diffstat (limited to 'reproduce')
| -rw-r--r-- | reproduce/software/make/basic.mk | 8 |
1 files changed, 8 insertions, 0 deletions
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 |