package/libarchive: fix uclibc build with libiconv (again)
Commit 7991d2c48a
wrongly removed patch
added by commit 1e8cce6f2b
, advocating
that upstream applied a different "solution", this "solution" was
already tested on buildroot with commit
9525bc7e64
and is utterly broken as stated
in:
https://github.com/libarchive/libarchive/pull/1825#issuecomment-1403537856
https://github.com/libarchive/libarchive/pull/1825#issuecomment-1437451472
https://github.com/libarchive/libarchive/issues/1819#issuecomment-1439962521
https://github.com/libarchive/libarchive/issues/1841#issuecomment-1426628554
https://github.com/libarchive/libarchive/pull/1813#issuecomment-1396373372
As a result, build failures are again raised by uclibc-ng with libiconv
on fwup/gvfs/...:
configure: error: Requires libarchive. Libarchive must be built with zlib support.
[...]
Run-time dependency libarchive found: NO (tried cmake)
../output-1/build/gvfs-1.48.1/meson.build:405:2: ERROR: Dependency lookup for libarchive with method 'pkgconfig' failed: Could not generate cargs for libarchive:
Package iconv was not found in the pkg-config search path.
Perhaps you should add the directory containing `iconv.pc'
to the PKG_CONFIG_PATH environment variable
Package 'iconv', required by 'libarchive', not found
So revert the upstream "solution", put back previous patch and let's
hope that upstream improve their skills in pkg-config and static
building but they probably don't really care about it...
Fixes:
- http://autobuild.buildroot.org/results/0f5058634ecc2ffae3993f6f4513d8ce75e6c02f
- http://autobuild.buildroot.org/results/20fc291ef7e37ee8bd553976cbe841e53345680b
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>