summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2018-01-13 10:16:20 +0100
committerFabian Groffen <grobian@gentoo.org>2018-01-13 10:16:20 +0100
commit21d8dc6dfba3beb431230ac355906cf73a62063e (patch)
treec6c1206e17baccfb29946d3abd8df93542e2d269 /sys-libs
parentscripts/bootstrap-prefix: also add rpath entries for special libdir (diff)
downloadprefix-21d8dc6dfba3beb431230ac355906cf73a62063e.tar.gz
prefix-21d8dc6dfba3beb431230ac355906cf73a62063e.tar.bz2
prefix-21d8dc6dfba3beb431230ac355906cf73a62063e.zip
sys-libs/ncurses: fix build during bootstrap
When no ncurses is installed and not doing cross compilation, as during bootstrap, we should not attempt to build cross tools, because configure wasn't run to create them. Normally this doesn't happen, because ncurses would be installed already, but during a bootstrap this obviously isn't the case. Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/ncurses/Manifest21
-rw-r--r--sys-libs/ncurses/ncurses-6.0-r2.ebuild2
2 files changed, 2 insertions, 21 deletions
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 0afd35d992..bc5c230fbe 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,22 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
DIST host-libtool-0.1.0.tar.gz 388867 BLAKE2B e8bfd1212f39d6262721c4a12535799f4e3428b83f3174bac373c15813462950218dd689380ab8caaf84186b60c29a1fafadfa1c2d0e5cb7f76f6d1699bdcabc SHA512 d8764d7814abf06556fb6eb19c12c2de1d1dc9f2f325deae55606ddfcf88963d65713d6fbd1fae0ab1a0668d90f84204e1cdcbd557944660ab01ecfe3a824ca5
DIST ncurses-5.9.tar.gz 2826473 BLAKE2B 91101b049a5eb6a2674fb86b5eba56515207f490dc7a6348f3194bbc50649717a26aff7a0df64f67ca318b5f244455cd57e760c65b9e551f6ec65b8c035a6ae1 SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1
-DIST ncurses-6.0.tar.gz 3131891 SHA256 f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260 SHA512 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963 WHIRLPOOL 25bef32a63113f07259e81e2cd34b7065e32b471d190c79d56df6e7187fa0d76ae4585ecb2a5d36b3a3dc4facecc9c928503aa97195344a8594ad031bae41949
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCAAdFiEEqGPdSmYcJzzTeG67KfsOnscZ7iAFAlpV/hIACgkQKfsOnscZ
-7iBF/g/+LIAo/FcVX3E0yQw7KUG0bI3SHViyKFonl5JwE3EwaS+s4JtjgvtNiX4N
-M4+TGH3WrIAC8MyEElXnUTUCawDHFxqtGBSuIqIHKZEwMezssJFTMKFU0WDlUU3W
-eEMmDA1ahNUp8GrTv05sWT5HZXxj/KwcF4OWJ4m0WEtmD5C8YJDgEbzhK4SgJfEK
-sqmaROR6fuNu/iiiQsMN6x9lGy6cchyd6MWPZUFhjWmCsGJ1ZQlChl6xYi4d9E26
-MELv85fY02jGnRK/dnCNMe1GhNRq+UYUkqYDlce/20kMMoFgtTFMI6LGs357S1fE
-njqlBJBal8ZuNS+ZExf1g7DzVbbx2dUztYpLJiWP+5fsHWbgW+x/S2tCnNPZvvqL
-9H8ZYK638cJ0qhVGaRRrTOB+VBebdyJMRv2AwhDReA3YroAdLw8KSiFfTNbBx71h
-nY55it3C+sctPk6pwIRLkl1ZWOoQwg52gHrbYt0GwZSPIor3CjQFgGXD4bFzsgFg
-q7wIAZSqM+wSvUKtyMvqXivG/3IUDsGHv4ps4abi1CwTVuJogqlfrxKPzGSVQ2UP
-7ZJBKDdPK1RP0Y04s8C52l2PtnqavKtGwGVFF5T54W9oYSSP4Nmqfo9vNRwSM2i5
-1TTrV9vkXrbwxUBcf3X8jPYMb+AUzxHY2aSmDSZYdvsA0ZQZ8Ow=
-=chTB
------END PGP SIGNATURE-----
+DIST ncurses-6.0.tar.gz 3131891 BLAKE2B 68670ebdaba28c7a750631da01a0e3681b476cc9e9ae6fd9eae5a254f41fab5f1a5df5fa9897a92d1da751f1cc0b72f2ffee4603865900e67fcbb949c102cf78 SHA512 9ec194f4783dae6de8c529cac31b5cfbfcfea212c5d47b1f87cd49df013e38f8580a9e7aa1384918df0921b4ba999d5e73eb6d6362cce2d7287e64308b673963
diff --git a/sys-libs/ncurses/ncurses-6.0-r2.ebuild b/sys-libs/ncurses/ncurses-6.0-r2.ebuild
index ec83475439..0b89379de4 100644
--- a/sys-libs/ncurses/ncurses-6.0-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0-r2.ebuild
@@ -189,7 +189,7 @@ do_configure() {
src_compile() {
# See comments in src_configure.
- if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
+ if ! ROOT=/ has_version "~sys-libs/${P}:0" && !multilib_is_native_abi ; then
# We make 'tic$(x)' here, for Cygwin having x=".exe".
BUILD_DIR="${WORKDIR}" \
do_compile cross -C progs all PROGS='tic$(x)'