mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-17 07:11:36 +01:00
sys-libs/ncurses: Sync with Gentoo's latest stable
This commit is contained in:
David Michael
David Michael
parent
a126d8b078
commit
9dcfd7fc52
@ -1,32 +1 @@
|
|||||||
-----BEGIN PGP SIGNED MESSAGE-----
|
DIST ncurses-6.1.tar.gz 3365395 SHA256 aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17 SHA512 e308af43f8b7e01e98a55f4f6c4ee4d1c39ce09d95399fa555b3f0cdf5fd0db0f4c4d820b4af78a63f6cf6d8627587114a40af48cfc066134b600520808a77ee WHIRLPOOL ae1af38f8085fd9c80d1695243e2f8f21771db07d3ffe8ecf8c45945481fbac6d597459a86eaeee7d413154d05c2be8baa95077856124fd3584d30f78f26aab3
|
||||||
Hash: SHA256
|
|
||||||
|
|
||||||
AUX ncurses-5.7-nongnu.patch 361 SHA256 7efcf3daf57d73e348bea1ea7ee77071aef5338631958fd0db595a011570cec4 SHA512 818a3ac1c68c1a11f23471195a32793c5546c5b37a724989cc58f3fad50fd3c8608762efc5d72e986f3c77ccdfbb72f27224f64ef415a96d71924a9f1d3b1b5f WHIRLPOOL a93e22415092ab51f769e42586813c8fed5b502e1dd86d09844f524876ac025ca81399dde483478087bb6241214f85c29a27f8b4ccadc2aec37be99dc7d6da1b
|
|
||||||
AUX ncurses-5.8-gfbsd.patch 695 SHA256 68c405dcd1b2bbad1d4880d906ba9e02ad62691c63edfb363ad767ee01079e82 SHA512 d4c375107415b7eaf5f8e04b697ef16998855b5f1d745766a14a7e9523d12b24d0841e6559217eccf62535f54e0d240eabaa3da1571964f1bb150b0c0cd102a2 WHIRLPOOL 6c2f865bc22a3932f6f973f7b53c5a50254505c4944c656af95c2399933c31acc5d5536d59fe9fe7c59ef537ce0d39ca19c9d0558e4aaacb7122749a575cadac
|
|
||||||
AUX ncurses-5.9-fix-clang-build.patch 1291 SHA256 0ffec4dbc7dc4a2356460c2a001b6ffbd8b060ae0afbdf3551a13575c20830d0 SHA512 d911441e2e2e2a752236f1eee42955b43ffabe37e47c337a86562c3708aca1fc2650ce77fe5aa6197eb8e9a67958a4b4db8f4344d22fe15868e25b933b175bb1 WHIRLPOOL d5d363f6d7cdcc350b195066c8183609bd9351a48603acdae2f374af13afb23a7bd05cbac86b13d2162daf5bd895eb5acce4769fce2f0b4b8da2896e00d1f846
|
|
||||||
AUX ncurses-5.9-gcc-5.patch 1367 SHA256 6d40c4841e031fbb8b1ea6691b112aabc398d23b20b4458ec0b6eb78c33af88d SHA512 200388ee1e8d8f656620d067e8993f79a50ed1a6ebee41ce8bd32b2a61cbe10c93347e2604229b58299c457640b247261a4d05afe60802dd4cce80d17bc2f10c WHIRLPOOL afe4c3854c2fe8096ffa87b5b7e0076a4814ab90ab463346386e4f3ef24295c5c44ae588b8c3147399505072d8cbbf45b9970bacbffba709500bbbdb43a77bf3
|
|
||||||
AUX ncurses-5.9-no-I-usr-include.patch 1431 SHA256 496e5dea489d60078344df651c3c2ea06d3dd083d83add0df60dde9104197154 SHA512 a58aec17e4c2edb3f8ed3f414ec6a89afe9f5fcc7cea898774a1fd7e7e892f9b66b1c2bdc74381dd5e8c9cf6968ad922406974f9ece8b38095b29e32d3ff0805 WHIRLPOOL d390ee0439f89dacaa9b5ea5402fc4e6bcf3d48b4bc77c93ff882fcd93f611f99ebd0ae4ce91eea1bec83b4d0191e0ead3361447448a84fc59496e6295116042
|
|
||||||
AUX ncurses-5.9-pkg-config.patch 1022 SHA256 8b32d53c4a94eeb78f39c29b1e66813bdb2fd5225f96ab7c26950f96679b58fb SHA512 a5578a4a6c2a334a77084da21d61d4a9edd7b82f027d7f54ed7be194ace5076fe86dc51ada916388feeb970255bf3bfbb09cd33072b1ef21de0dbaa5ee45fdf6 WHIRLPOOL 9056961c1b617ca3286cc4c528a5b5da821a5472da105d82b56c925034454a600e818265627d2f17dbad5184ecf78ea4d14807838bed789ca01a85f39755b656
|
|
||||||
AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 SHA256 ae684be42600ac3bbbf6e7be61e085524f65d86c20da8c453b10c27516e30b27 SHA512 82c0a9600f6ca8f36bbdce6f11a96906983fc9efd6b5f1e17134e12283e29b16d04f5e66c10edbcb7087cc4cb8fc23ddd065f9b6c8b0bf72ca684b68383e5131 WHIRLPOOL 1e2fe441d97671b84f49388555c351b235a93704fb7fcf13c14343db569cc91f21d75b60eb635c4c1c3ad18778bcb50e5aa63d25583224ed644edff35356dd2c
|
|
||||||
DIST ncurses-5.9.tar.gz 2826473 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b SHA512 d7c5e54b6d4d8b9211f0006ca8786f7609d180cc1aaebf4f25e7e35e12959779cf66447359a602daed625621ca32b0d910d67aef3eb8b6fdc3c373819a88faa1 WHIRLPOOL 069e98c6392ce9aca960c72a20f1a502387d33a4b237aaeaa95548024ce4d47b129eafbe0288d21c590e725fe71aaca21cacb300f11a660b7234cb39a777672a
|
|
||||||
EBUILD ncurses-5.9-r3.ebuild 7079 SHA256 6469e2e8827f6b56e9eec89c4eeb8c27c05896458b3cb5d2e8c0178c4502362f SHA512 7881efb51872705471ba07c9a3b67c1bc2ecec34e54aaa197ee85486a638887a5f64961f824ac4c1cf9da1a18b89ccad6b99d01dd7e213acc135ddb265bec565 WHIRLPOOL 10d50400d41f67c2d8aad059553b7b6f1fc43ec97faa6fbe12d7f9d1b3002fdc466cf2fea84f523a3b70d25c771a02bfb784f93b306c4ca22d5188befbae5089
|
|
||||||
EBUILD ncurses-5.9-r4.ebuild 7323 SHA256 3f1e36c5a38ad1009e2813a6eec91de04a1f5dea3c48f581b381001d2e074937 SHA512 1c652600c854faeda6f953be7385281a97b810747cd5a9329320068e7b13edec2c063deb180ee99a9c8360ba8c29b462dd8a59adef1de084a766ed7659ba7afb WHIRLPOOL a2db8f53975f5b2558f21b74f2d6da7df346244993d0c5940c4eebe10088475bdd18a1a569c1af6ec1853c145bb588d6e1a8877a4b78ab32a9640ac1dfbefd3f
|
|
||||||
MISC ChangeLog 34227 SHA256 c270819f5451e01fb6cf955db5572216a7ff623276e8c2a637c85211301b2fc9 SHA512 276e5b0a59cc7e28d230728a4b6db5e1761893ce68b54e693e37d9f6a0d7e364840648079f7ae862869a25315d90f5ba62dcf575212d008c32273c8a3af02a8c WHIRLPOOL d34b60dc0d336349e0240c6ef01e6258def63970fe2e2ee6efb62a889dfa40c46c6e8b38195f4cf742def6fffe877ba8af110d5569c10aa26a08d9a63e72e507
|
|
||||||
MISC metadata.xml 530 SHA256 3a0f1bf7ab8ec067416e6535c3270113b53716b12aac504a581acf5b27f8114f SHA512 27d968272c8d184804d9764bb2ec8fb86eb5826bfe14e7f445c7c5f0b89cc7fe4271546a6994d830cb1270fa93f187ded1c96b4f4f1fe1b5c417c78a2082dfd3 WHIRLPOOL 54ff921a2a89b19d6d75830033b7d18c0f7643af248bea029b1a7ebe201eded0eff54dde04858be08903cb6607e7cbcb8ca100712d4992324dbb757184150d44
|
|
||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v2
|
|
||||||
|
|
||||||
iQIcBAEBCAAGBQJVIuhWAAoJEPGu1DbS6WIA1qcP+gK/XlRLEnGeq50Rb3vdZ8zW
|
|
||||||
4uEPSYesfkeTeau4CFjp8TomGGLSLECabbQEbB0yc2M/Ws4exN3r0PFxoOCl5Kd+
|
|
||||||
CCsVf1AdyvPb7X7XgHc/L563oGEPGjAAr0JrHZTNV+hezvHorlH8hHWo3xISJmz/
|
|
||||||
I82ebE8VoNrQobtxC27xTb0iDl8ayzzu50Qq18s0pyQO6SKLI495L2vYJcDZW8ys
|
|
||||||
LlD5bHun1bMf0Zwg3ZguzpJ1TWpdUqBdUfc5x8B29CwgB4AdsiOes5oEiiEQ1hDZ
|
|
||||||
ij/kqD3UKkL+khnKuvPLtdnZGjNYBDGwOUUj6uLSFLAdKvgjNXoSdd/6aWxB2SJ1
|
|
||||||
aQy6+b2VGnPlmBb/4DgEaBZfiLVY69o64YAelkHZD7bA+c1q3os0qgk/frQrWM+D
|
|
||||||
gu/mq4ghbrqJyL7MFqc85pGJhlP9c+gnYJxqEygQQQ9RJXFNh4vJCWNJhOU/1haD
|
|
||||||
H9Br1m2gZl1tbZl6IvRIWBQju/LiZSDTIDnWSa9EhJe22zXth7ZrJK3mlMqFWDjo
|
|
||||||
ZGIw8JH0pNEx5vDhZdzoDTON2HEAdSrlnD2NyH32ixjqfz/i7uOWjzTc3Gu71lFF
|
|
||||||
+u4wVAp0Du0iaTPfMrO7NHghGykCOz4KvJ3Jl1pT4Xz2YUvcHPR5srCcPR4s/eKA
|
|
||||||
tZdf8rmbrW1pfYbYLMMw
|
|
||||||
=zCx5
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
|
|||||||
@ -1,24 +0,0 @@
|
|||||||
we'll hijack the freebsd* case that comes later
|
|
||||||
|
|
||||||
--- ncurses-5.6/aclocal.m4
|
|
||||||
+++ ncurses-5.6/aclocal.m4
|
|
||||||
@@ -3806,7 +3806,7 @@
|
|
||||||
fi
|
|
||||||
cf_cv_rm_so_locs=yes
|
|
||||||
;;
|
|
||||||
- linux*|gnu*|k*bsd*-gnu) #(vi
|
|
||||||
+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi
|
|
||||||
if test "$DFT_LWR_MODEL" = "shared" ; then
|
|
||||||
LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
|
|
||||||
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
|
||||||
--- ncurses-5.6/configure
|
|
||||||
+++ ncurses-5.6/configure
|
|
||||||
@@ -3806,7 +3806,7 @@
|
|
||||||
fi
|
|
||||||
cf_cv_rm_so_locs=yes
|
|
||||||
;;
|
|
||||||
- linux*|gnu*|k*bsd*-gnu) #(vi
|
|
||||||
+ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi
|
|
||||||
if test "$DFT_LWR_MODEL" = "shared" ; then
|
|
||||||
LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)"
|
|
||||||
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
|
||||||
@ -1,177 +0,0 @@
|
|||||||
From fed65dd4e3fddb3c8f568a77b66c8b97c6757ad0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Thomas E. Dickey" <dickey@invisible-island.net>
|
|
||||||
Date: Sun, 13 Oct 2013 00:58:13 +0000
|
|
||||||
Subject: [PATCH] ncurses 5.9 - patch 20131012 - compiler warnings
|
|
||||||
|
|
||||||
+ fix a few compiler warnings in progs and test.
|
|
||||||
---
|
|
||||||
progs/tset.c | 73 +++++++++++++++++++++++++++++++++-------------------------
|
|
||||||
test/ncurses.c | 2 +-
|
|
||||||
2 files changed, 42 insertions(+), 33 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/progs/tset.c b/progs/tset.c
|
|
||||||
index 084e41d..8bedd14 100644
|
|
||||||
--- a/progs/tset.c
|
|
||||||
+++ b/progs/tset.c
|
|
||||||
@@ -788,14 +788,14 @@ reset_mode(void)
|
|
||||||
mode.c_cc[VWERASE] = CHK(mode.c_cc[VWERASE], CWERASE);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
- mode.c_iflag &= ~(IGNBRK | PARMRK | INPCK | ISTRIP | INLCR | IGNCR
|
|
||||||
+ mode.c_iflag &= ~((unsigned) (IGNBRK | PARMRK | INPCK | ISTRIP | INLCR | IGNCR
|
|
||||||
#ifdef IUCLC
|
|
||||||
- | IUCLC
|
|
||||||
+ | IUCLC
|
|
||||||
#endif
|
|
||||||
#ifdef IXANY
|
|
||||||
- | IXANY
|
|
||||||
+ | IXANY
|
|
||||||
#endif
|
|
||||||
- | IXOFF);
|
|
||||||
+ | IXOFF));
|
|
||||||
|
|
||||||
mode.c_iflag |= (BRKINT | IGNPAR | ICRNL | IXON
|
|
||||||
#ifdef IMAXBEL
|
|
||||||
@@ -803,44 +803,44 @@ reset_mode(void)
|
|
||||||
#endif
|
|
||||||
);
|
|
||||||
|
|
||||||
- mode.c_oflag &= ~(0
|
|
||||||
+ mode.c_oflag &= ~((unsigned) (0
|
|
||||||
#ifdef OLCUC
|
|
||||||
- | OLCUC
|
|
||||||
+ | OLCUC
|
|
||||||
#endif
|
|
||||||
#ifdef OCRNL
|
|
||||||
- | OCRNL
|
|
||||||
+ | OCRNL
|
|
||||||
#endif
|
|
||||||
#ifdef ONOCR
|
|
||||||
- | ONOCR
|
|
||||||
+ | ONOCR
|
|
||||||
#endif
|
|
||||||
#ifdef ONLRET
|
|
||||||
- | ONLRET
|
|
||||||
+ | ONLRET
|
|
||||||
#endif
|
|
||||||
#ifdef OFILL
|
|
||||||
- | OFILL
|
|
||||||
+ | OFILL
|
|
||||||
#endif
|
|
||||||
#ifdef OFDEL
|
|
||||||
- | OFDEL
|
|
||||||
+ | OFDEL
|
|
||||||
#endif
|
|
||||||
#ifdef NLDLY
|
|
||||||
- | NLDLY
|
|
||||||
+ | NLDLY
|
|
||||||
#endif
|
|
||||||
#ifdef CRDLY
|
|
||||||
- | CRDLY
|
|
||||||
+ | CRDLY
|
|
||||||
#endif
|
|
||||||
#ifdef TABDLY
|
|
||||||
- | TABDLY
|
|
||||||
+ | TABDLY
|
|
||||||
#endif
|
|
||||||
#ifdef BSDLY
|
|
||||||
- | BSDLY
|
|
||||||
+ | BSDLY
|
|
||||||
#endif
|
|
||||||
#ifdef VTDLY
|
|
||||||
- | VTDLY
|
|
||||||
+ | VTDLY
|
|
||||||
#endif
|
|
||||||
#ifdef FFDLY
|
|
||||||
- | FFDLY
|
|
||||||
+ | FFDLY
|
|
||||||
#endif
|
|
||||||
- );
|
|
||||||
+ ));
|
|
||||||
|
|
||||||
mode.c_oflag |= (OPOST
|
|
||||||
#ifdef ONLCR
|
|
||||||
@@ -848,19 +848,19 @@ reset_mode(void)
|
|
||||||
#endif
|
|
||||||
);
|
|
||||||
|
|
||||||
- mode.c_cflag &= ~(CSIZE | CSTOPB | PARENB | PARODD | CLOCAL);
|
|
||||||
+ mode.c_cflag &= ~((unsigned) (CSIZE | CSTOPB | PARENB | PARODD | CLOCAL));
|
|
||||||
mode.c_cflag |= (CS8 | CREAD);
|
|
||||||
- mode.c_lflag &= ~(ECHONL | NOFLSH
|
|
||||||
+ mode.c_lflag &= ~((unsigned) (ECHONL | NOFLSH
|
|
||||||
#ifdef TOSTOP
|
|
||||||
- | TOSTOP
|
|
||||||
+ | TOSTOP
|
|
||||||
#endif
|
|
||||||
#ifdef ECHOPTR
|
|
||||||
- | ECHOPRT
|
|
||||||
+ | ECHOPRT
|
|
||||||
#endif
|
|
||||||
#ifdef XCASE
|
|
||||||
- | XCASE
|
|
||||||
+ | XCASE
|
|
||||||
#endif
|
|
||||||
- );
|
|
||||||
+ ));
|
|
||||||
|
|
||||||
mode.c_lflag |= (ISIG | ICANON | ECHO | ECHOE | ECHOK
|
|
||||||
#ifdef ECHOCTL
|
|
||||||
@@ -907,14 +907,23 @@ static void
|
|
||||||
set_control_chars(void)
|
|
||||||
{
|
|
||||||
#ifdef TERMIOS
|
|
||||||
- if (DISABLED(mode.c_cc[VERASE]) || terasechar >= 0)
|
|
||||||
- mode.c_cc[VERASE] = (terasechar >= 0) ? terasechar : default_erase();
|
|
||||||
+ if (DISABLED(mode.c_cc[VERASE]) || terasechar >= 0) {
|
|
||||||
+ mode.c_cc[VERASE] = UChar((terasechar >= 0)
|
|
||||||
+ ? terasechar
|
|
||||||
+ : default_erase());
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- if (DISABLED(mode.c_cc[VINTR]) || intrchar >= 0)
|
|
||||||
- mode.c_cc[VINTR] = (intrchar >= 0) ? intrchar : CINTR;
|
|
||||||
+ if (DISABLED(mode.c_cc[VINTR]) || intrchar >= 0) {
|
|
||||||
+ mode.c_cc[VINTR] = UChar((intrchar >= 0)
|
|
||||||
+ ? intrchar
|
|
||||||
+ : CINTR);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
- if (DISABLED(mode.c_cc[VKILL]) || tkillchar >= 0)
|
|
||||||
- mode.c_cc[VKILL] = (tkillchar >= 0) ? tkillchar : CKILL;
|
|
||||||
+ if (DISABLED(mode.c_cc[VKILL]) || tkillchar >= 0) {
|
|
||||||
+ mode.c_cc[VKILL] = UChar((tkillchar >= 0)
|
|
||||||
+ ? tkillchar
|
|
||||||
+ : CKILL);
|
|
||||||
+ }
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -970,9 +979,9 @@ set_conversions(void)
|
|
||||||
if (newline != (char *) 0 && newline[0] == '\n' && !newline[1]) {
|
|
||||||
/* Newline, not linefeed. */
|
|
||||||
#ifdef ONLCR
|
|
||||||
- mode.c_oflag &= ~ONLCR;
|
|
||||||
+ mode.c_oflag &= ~((unsigned) ONLCR);
|
|
||||||
#endif
|
|
||||||
- mode.c_iflag &= ~ICRNL;
|
|
||||||
+ mode.c_iflag &= ~((unsigned) ICRNL);
|
|
||||||
}
|
|
||||||
#ifdef __OBSOLETE__
|
|
||||||
if (tgetflag("HD")) /* Half duplex. */
|
|
||||||
diff --git a/test/ncurses.c b/test/ncurses.c
|
|
||||||
index 5a422cf..75063a7 100644
|
|
||||||
--- a/test/ncurses.c
|
|
||||||
+++ b/test/ncurses.c
|
|
||||||
@@ -1678,7 +1678,7 @@ wide_show_attr(int row, int skip, bool arrow, chtype attr, short pair, const cha
|
|
||||||
attr_t old_attr;
|
|
||||||
short old_pair;
|
|
||||||
|
|
||||||
- (void) attr_get(&old_attr, &old_pair, 0);
|
|
||||||
+ (void) (attr_get)(&old_attr, &old_pair, 0);
|
|
||||||
(void) attr_set(attr, pair, 0);
|
|
||||||
addwstr(wide_attr_test_string);
|
|
||||||
(void) attr_set(old_attr, old_pair, 0);
|
|
||||||
--
|
|
||||||
2.7.3
|
|
||||||
|
|
||||||
@ -1,44 +0,0 @@
|
|||||||
diff --git a/ncurses-5.9/c++/cursesf.h b/ncurses-5.9/c++/cursesf.h
|
|
||||||
index 70a30c3..db38063 100644
|
|
||||||
--- a/ncurses-5.9/c++/cursesf.h
|
|
||||||
+++ b/ncurses-5.9/c++/cursesf.h
|
|
||||||
@@ -677,7 +677,7 @@ protected:
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
|
||||||
- NCursesUserForm (NCursesFormField Fields[],
|
|
||||||
+ NCursesUserForm (NCursesFormField* Fields[],
|
|
||||||
const T* p_UserData = STATIC_CAST(T*)(0),
|
|
||||||
bool with_frame=FALSE,
|
|
||||||
bool autoDelete_Fields=FALSE)
|
|
||||||
@@ -686,7 +686,7 @@ public:
|
|
||||||
set_user (const_cast<void *>(p_UserData));
|
|
||||||
};
|
|
||||||
|
|
||||||
- NCursesUserForm (NCursesFormField Fields[],
|
|
||||||
+ NCursesUserForm (NCursesFormField* Fields[],
|
|
||||||
int nlines,
|
|
||||||
int ncols,
|
|
||||||
int begin_y = 0,
|
|
||||||
diff --git a/ncurses-5.9/c++/cursesm.h b/ncurses-5.9/c++/cursesm.h
|
|
||||||
index d9c2273..2d5b79a 100644
|
|
||||||
--- a/ncurses-5.9/c++/cursesm.h
|
|
||||||
+++ b/ncurses-5.9/c++/cursesm.h
|
|
||||||
@@ -635,7 +635,7 @@ protected:
|
|
||||||
}
|
|
||||||
|
|
||||||
public:
|
|
||||||
- NCursesUserMenu (NCursesMenuItem Items[],
|
|
||||||
+ NCursesUserMenu (NCursesMenuItem* Items[],
|
|
||||||
const T* p_UserData = STATIC_CAST(T*)(0),
|
|
||||||
bool with_frame=FALSE,
|
|
||||||
bool autoDelete_Items=FALSE)
|
|
||||||
@@ -644,7 +644,7 @@ public:
|
|
||||||
set_user (const_cast<void *>(p_UserData));
|
|
||||||
};
|
|
||||||
|
|
||||||
- NCursesUserMenu (NCursesMenuItem Items[],
|
|
||||||
+ NCursesUserMenu (NCursesMenuItem* Items[],
|
|
||||||
int nlines,
|
|
||||||
int ncols,
|
|
||||||
int begin_y = 0,
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
https://bugs.gentoo.org/522586
|
|
||||||
|
|
||||||
delete the -I$includedir paths that get added to CPPFLAGS. these are never
|
|
||||||
needed when building natively or cross-compiling and really get in the way
|
|
||||||
in both cases (upgrades/cross-compiling/etc...).
|
|
||||||
|
|
||||||
extracted from the upstream change:
|
|
||||||
http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff;h=9ee3995474454b7d956885e0fe5c8cac2ae25d42#patch5
|
|
||||||
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -18596,33 +18596,11 @@ CPPFLAGS="$CPPFLAGS -I. -I../include"
|
|
||||||
if test "$srcdir" != "."; then
|
|
||||||
CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
|
|
||||||
fi
|
|
||||||
-if test "$GCC" != yes; then
|
|
||||||
- CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
|
||||||
-elif test "$includedir" != "/usr/include"; then
|
|
||||||
- if test "$includedir" = '${prefix}/include' ; then
|
|
||||||
- if test $prefix != /usr ; then
|
|
||||||
- CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
|
||||||
- fi
|
|
||||||
- else
|
|
||||||
- CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
|
||||||
- fi
|
|
||||||
-fi
|
|
||||||
|
|
||||||
ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS"
|
|
||||||
if test "$srcdir" != "."; then
|
|
||||||
ACPPFLAGS="-I\${srcdir}/../../include $ACPPFLAGS"
|
|
||||||
fi
|
|
||||||
-if test "$GCC" != yes; then
|
|
||||||
- ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
|
|
||||||
-elif test "$includedir" != "/usr/include"; then
|
|
||||||
- if test "$includedir" = '${prefix}/include' ; then
|
|
||||||
- if test $prefix != /usr ; then
|
|
||||||
- ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
|
|
||||||
- fi
|
|
||||||
- else
|
|
||||||
- ACPPFLAGS="$ACPPFLAGS -I\${includedir}"
|
|
||||||
- fi
|
|
||||||
-fi
|
|
||||||
|
|
||||||
### Build up pieces for makefile rules
|
|
||||||
echo "$as_me:18628: checking default library suffix" >&5
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
disable the $PATH search for the PKG_CONFIG tool. it isn't needed and just
|
|
||||||
gets in the way when setting to a value that might not yet exist.
|
|
||||||
|
|
||||||
disable the existence test for the PKG_CONFIG_LIBDIR dir. it breaks when you
|
|
||||||
cross-compile for an ABI that doesn't exist in the root dir (--build).
|
|
||||||
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -3582,7 +3582,7 @@ fi
|
|
||||||
esac
|
|
||||||
|
|
||||||
test -z "$PKG_CONFIG" && PKG_CONFIG=none
|
|
||||||
-if test "$PKG_CONFIG" != none ; then
|
|
||||||
+if false ; then
|
|
||||||
|
|
||||||
if test "x$prefix" != xNONE; then
|
|
||||||
cf_path_syntax="$prefix"
|
|
||||||
@@ -3626,7 +3626,7 @@ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C
|
|
||||||
PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
|
|
||||||
fi
|
|
||||||
PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
|
|
||||||
- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
|
|
||||||
+ if test -n "$PKG_CONFIG_LIBDIR" ; then
|
|
||||||
|
|
||||||
# Check whether --enable-pc-files or --disable-pc-files was given.
|
|
||||||
if test "${enable_pc_files+set}" = set; then
|
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
https://bugs.gentoo.org/601426
|
||||||
|
https://lists.gnu.org/archive/html/bug-ncurses/2015-02/msg00012.html
|
||||||
|
|
||||||
|
From: John Vogel
|
||||||
|
Subject: [PATCH] c++ binding missed when cross compiling
|
||||||
|
Date: Mon, 16 Feb 2015 01:01:48 -0500
|
||||||
|
|
||||||
|
The configure script hard codes the include dir to the prefix'ed include dir,
|
||||||
|
when checking if c++ compiler works. This breaks the compiler's built-in search
|
||||||
|
path. I've included two patches. The first works on the configure.in file, which
|
||||||
|
requires your autoconf stuff to test and I'm not ready to meddle with at the
|
||||||
|
moment. The other works directly on the configure file. I've tested the second
|
||||||
|
one; it should mirror what the first patch tries to achieve and works for me.
|
||||||
|
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -2938,10 +2938,6 @@
|
||||||
|
echo "$as_me:2938: checking if $CXX works" >&5
|
||||||
|
echo $ECHO_N "checking if $CXX works... $ECHO_C" >&6
|
||||||
|
|
||||||
|
- save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
- eval cf_includedir=${includedir}
|
||||||
|
- CPPFLAGS="$CPPFLAGS -I${cf_includedir}"
|
||||||
|
-
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
#line 2946 "configure"
|
||||||
|
#include "confdefs.h"
|
||||||
|
@@ -2978,7 +2974,6 @@
|
||||||
|
cf_cxx_works=no
|
||||||
|
fi
|
||||||
|
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||||
|
- CPPFLAGS="$save_CPPFLAGS"
|
||||||
|
|
||||||
|
echo "$as_me:2983: result: $cf_cxx_works" >&5
|
||||||
|
echo "${ECHO_T}$cf_cxx_works" >&6
|
||||||
24
sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch
vendored
Normal file
24
sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-gfbsd.patch
vendored
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
we'll hijack the freebsd* case that comes later
|
||||||
|
|
||||||
|
--- ncurses-6.0/aclocal.m4
|
||||||
|
+++ ncurses-6.0/aclocal.m4
|
||||||
|
@@ -5711,7 +5711,7 @@
|
||||||
|
fi
|
||||||
|
cf_cv_rm_so_locs=yes
|
||||||
|
;;
|
||||||
|
- (linux*|gnu*|k*bsd*-gnu)
|
||||||
|
+ (linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
|
||||||
|
if test "$DFT_LWR_MODEL" = "shared" ; then
|
||||||
|
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
||||||
|
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
||||||
|
--- ncurses-6.0/configure
|
||||||
|
+++ ncurses-6.0/configure
|
||||||
|
@@ -6188,7 +6188,7 @@
|
||||||
|
fi
|
||||||
|
cf_cv_rm_so_locs=yes
|
||||||
|
;;
|
||||||
|
- (linux*|gnu*|k*bsd*-gnu)
|
||||||
|
+ (linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*)
|
||||||
|
if test "$DFT_LWR_MODEL" = "shared" ; then
|
||||||
|
LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
|
||||||
|
LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
|
||||||
14
sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch
vendored
Normal file
14
sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-pkg-config.patch
vendored
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
disable the $PATH search for the PKG_CONFIG tool. it isn't needed and just
|
||||||
|
gets in the way when setting to a value that might not yet exist.
|
||||||
|
|
||||||
|
--- ncurses-6.0/configure
|
||||||
|
+++ ncurses-6.0/configure
|
||||||
|
@@ -3533,7 +3533,7 @@
|
||||||
|
esac
|
||||||
|
|
||||||
|
test -z "$PKG_CONFIG" && PKG_CONFIG=none
|
||||||
|
-if test "$PKG_CONFIG" != none ; then
|
||||||
|
+if false ; then
|
||||||
|
|
||||||
|
if test "x$prefix" != xNONE; then
|
||||||
|
cf_path_syntax="$prefix"
|
||||||
@ -10,10 +10,10 @@ which includes 256 color support and fixes Gentoo bug 383871
|
|||||||
|
|
||||||
http://bugs.gentoo.org/show_bug.cgi?id=383871
|
http://bugs.gentoo.org/show_bug.cgi?id=383871
|
||||||
|
|
||||||
--- misc/terminfo.src
|
--- ncurses-6.0/misc/terminfo.src
|
||||||
+++ misc/terminfo.src
|
+++ ncurses-6.0/misc/terminfo.src
|
||||||
@@ -4208,6 +4208,176 @@
|
@@ -5214,6 +5214,176 @@
|
||||||
rxvt-16color|xterm with 16 colors like aixterm,
|
rxvt-16color|rxvt with 16 colors like aixterm,
|
||||||
ncv#32, use=ibm+16color, use=rxvt,
|
ncv#32, use=ibm+16color, use=rxvt,
|
||||||
|
|
||||||
+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
|
+# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
|
||||||
@ -186,6 +186,6 @@ http://bugs.gentoo.org/show_bug.cgi?id=383871
|
|||||||
+ pairs#32767,
|
+ pairs#32767,
|
||||||
+ use=rxvt-unicode,
|
+ use=rxvt-unicode,
|
||||||
+
|
+
|
||||||
|
#### MRXVT
|
||||||
# mrxvt 0.5.4
|
# mrxvt 0.5.4
|
||||||
#
|
#
|
||||||
# mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
|
|
||||||
15
sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch
vendored
Normal file
15
sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch
vendored
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
always include ticlib even when progs are disabled
|
||||||
|
|
||||||
|
https://bugs.gentoo.org/557360
|
||||||
|
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -21312,7 +21312,7 @@ echo "$as_me:21311: checking for library subsets" >&5
|
||||||
|
echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
|
||||||
|
LIB_SUBSETS=
|
||||||
|
|
||||||
|
-if test "x$cf_with_progs" = xyes || test "$with_ticlib" != no || test "$with_termcap" != no; then
|
||||||
|
+if true; then
|
||||||
|
LIB_SUBSETS="${LIB_SUBSETS}ticlib"
|
||||||
|
if test "$with_ticlib" != no ; then
|
||||||
|
LIB_SUBSETS="${LIB_SUBSETS} "
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
https://github.com/tmux/tmux/issues/1264
|
||||||
|
https://bugs.gentoo.org/651494
|
||||||
|
|
||||||
|
--- ncurses-6.1/misc/terminfo.src
|
||||||
|
+++ ncurses-6.1/misc/terminfo.src
|
||||||
|
@@ -6260,7 +6260,7 @@
|
||||||
|
%=%t3%e%p1%d%;m,
|
||||||
|
sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|
|
||||||
|
%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p7%t;8%;m,
|
||||||
|
- Ss=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
|
||||||
|
+ Ms=\E]52;%p1%s;%p2%s\007, kDN3=\E[1;3B, kDN5=\E[1;5B,
|
||||||
|
kLFT3=\E[1;3D, kLFT5=\E[1;5D, kNXT3=\E[6;3~,
|
||||||
|
kNXT5=\E[6;5~, kPRV3=\E[5;3~, kPRV5=\E[5;5~,
|
||||||
|
kRIT3=\E[1;3C, kRIT5=\E[1;5C, kUP3=\E[1;3A, kUP5=\E[1;5A,
|
||||||
@ -1,14 +1,17 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
<pkgmetadata>
|
<pkgmetadata>
|
||||||
<herd>base-system</herd>
|
<maintainer type="project">
|
||||||
|
<email>base-system@gentoo.org</email>
|
||||||
|
<name>Gentoo Base System</name>
|
||||||
|
</maintainer>
|
||||||
<use>
|
<use>
|
||||||
<flag name='ada'>Add bindings for the ADA programming language</flag>
|
<flag name="ada">Add bindings for the ADA programming language</flag>
|
||||||
<flag name='tinfo'>
|
<flag name="tinfo">
|
||||||
Build curses library (libncurses) sep from the low-level terminfo
|
Build curses library (libncurses) sep from the low-level terminfo
|
||||||
library (libtinfo) -- usually needed only for binary packages -- but
|
library (libtinfo) -- usually needed only for binary packages -- but
|
||||||
it is binary compatible in either mode
|
it is binary compatible in either mode
|
||||||
</flag>
|
</flag>
|
||||||
<flag name='trace'>Enable test trace() support in ncurses calls</flag>
|
<flag name="trace">Enable test trace() support in ncurses calls</flag>
|
||||||
</use>
|
</use>
|
||||||
</pkgmetadata>
|
</pkgmetadata>
|
||||||
|
|||||||
@ -1,242 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
inherit eutils flag-o-matic toolchain-funcs multilib-minimal
|
|
||||||
|
|
||||||
MY_PV=${PV:0:3}
|
|
||||||
PV_SNAP=${PV:4}
|
|
||||||
MY_P=${PN}-${MY_PV}
|
|
||||||
DESCRIPTION="console display library"
|
|
||||||
HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
|
|
||||||
SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="MIT"
|
|
||||||
# The subslot reflects the SONAME.
|
|
||||||
SLOT="0/5"
|
|
||||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
|
||||||
IUSE="ada +cxx debug doc gpm minimal profile static-libs symlink-usr tinfo trace unicode"
|
|
||||||
|
|
||||||
DEPEND="gpm? ( sys-libs/gpm )"
|
|
||||||
# berkdb? ( sys-libs/db )"
|
|
||||||
# Block the older ncurses that installed all files w/SLOT=5. #557472
|
|
||||||
RDEPEND="${DEPEND}
|
|
||||||
!<=sys-libs/ncurses-5.9-r5:5
|
|
||||||
!<x11-terms/rxvt-unicode-9.06-r3
|
|
||||||
abi_x86_32? (
|
|
||||||
!<=app-emulation/emul-linux-x86-baselibs-20130224-r12
|
|
||||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
|
||||||
)"
|
|
||||||
# Put the MULTILIB_USEDEP on gpm in PDEPEND only to avoid circular deps.
|
|
||||||
# We can move it to DEPEND and drop the --with-gpm=libgpm.so.1 from the econf
|
|
||||||
# line below once we can assume multilib gpm is available everywhere.
|
|
||||||
PDEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
|
|
||||||
|
|
||||||
S=${WORKDIR}/${MY_P}
|
|
||||||
HOSTTIC_DIR=${WORKDIR}/${P}-host
|
|
||||||
|
|
||||||
MINIMAL_TERMINFO=(ansi console dumb linux rxvt rxvt-256color rxvt-unicode rxvt-unicode-256color \
|
|
||||||
screen screen-16color screen-256color sun vt{52,100,102,200,220} \
|
|
||||||
xterm xterm-color xterm-256color xterm-xfree86)
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
[[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
|
|
||||||
epatch "${FILESDIR}"/${PN}-5.8-gfbsd.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
|
|
||||||
epatch "${FILESDIR}"/${PN}-5.9-fix-clang-build.patch #417763
|
|
||||||
epatch "${FILESDIR}"/${PN}-5.9-pkg-config.patch
|
|
||||||
epatch "${FILESDIR}"/${P}-no-I-usr-include.patch #522586
|
|
||||||
epatch "${FILESDIR}"/${P}-gcc-5.patch #545114
|
|
||||||
epatch "${FILESDIR}"/${P}-compiler-warnings.patch
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
unset TERMINFO #115036
|
|
||||||
tc-export_build_env BUILD_{CC,CPP}
|
|
||||||
BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
|
|
||||||
|
|
||||||
# when cross-compiling, we need to build up our own tic
|
|
||||||
# because people often don't keep matching host/target
|
|
||||||
# ncurses versions #249363
|
|
||||||
if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
|
|
||||||
CHOST=${CBUILD} \
|
|
||||||
CFLAGS=${BUILD_CFLAGS} \
|
|
||||||
CXXFLAGS=${BUILD_CXXFLAGS} \
|
|
||||||
CPPFLAGS=${BUILD_CPPFLAGS} \
|
|
||||||
LDFLAGS="${BUILD_LDFLAGS} -static" \
|
|
||||||
BUILD_DIR="${HOSTTIC_DIR}" do_configure cross --without-shared --with-normal
|
|
||||||
fi
|
|
||||||
multilib-minimal_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
do_configure narrowc
|
|
||||||
use unicode && do_configure widec --enable-widec --includedir="${EPREFIX}"/usr/include/ncursesw
|
|
||||||
}
|
|
||||||
|
|
||||||
do_configure() {
|
|
||||||
ECONF_SOURCE=${S}
|
|
||||||
|
|
||||||
mkdir "${BUILD_DIR}"-$1
|
|
||||||
cd "${BUILD_DIR}"-$1 || die
|
|
||||||
shift
|
|
||||||
|
|
||||||
local conf=(
|
|
||||||
# We need the basic terminfo files in /etc, bug #37026. We will
|
|
||||||
# add '--with-terminfo-dirs' and then populate /etc/terminfo in
|
|
||||||
# src_install() ...
|
|
||||||
--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
|
|
||||||
|
|
||||||
# Disabled until #245417 is sorted out.
|
|
||||||
#$(use_with berkdb hashed-db)
|
|
||||||
|
|
||||||
# ncurses is dumb and doesn't install .pc files unless pkg-config
|
|
||||||
# is also installed. Force the tests to go our way. Note that it
|
|
||||||
# doesn't actually use pkg-config ... it just looks for set vars.
|
|
||||||
--enable-pc-files
|
|
||||||
--with-pkg-config="$(tc-getPKG_CONFIG)"
|
|
||||||
# This path is used to control where the .pc files are installed.
|
|
||||||
PKG_CONFIG_LIBDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
|
|
||||||
|
|
||||||
# Now the rest of the various standard flags.
|
|
||||||
--with-shared
|
|
||||||
--without-hashed-db
|
|
||||||
$(use_with ada)
|
|
||||||
$(use_with cxx)
|
|
||||||
$(use_with cxx cxx-binding)
|
|
||||||
$(use_with debug)
|
|
||||||
$(use_with profile)
|
|
||||||
# The configure script uses ldd to parse the linked output which
|
|
||||||
# is flaky for cross-compiling/multilib/ldd versions/etc...
|
|
||||||
$(use_with gpm gpm libgpm.so.1)
|
|
||||||
--disable-termcap
|
|
||||||
--enable-symlinks
|
|
||||||
--with-rcs-ids
|
|
||||||
--with-manpage-format=normal
|
|
||||||
--enable-const
|
|
||||||
--enable-colorfgbg
|
|
||||||
--enable-echo
|
|
||||||
$(use_enable !ada warnings)
|
|
||||||
$(use_with debug assertions)
|
|
||||||
$(use_enable !debug leaks)
|
|
||||||
$(use_with debug expanded)
|
|
||||||
$(use_with !debug macros)
|
|
||||||
$(use_with trace)
|
|
||||||
$(use_with tinfo termlib)
|
|
||||||
|
|
||||||
# The chtype/mmask-t settings below are to retain ABI compat
|
|
||||||
# with ncurses-5.4 so dont change em !
|
|
||||||
--with-chtype=long
|
|
||||||
--with-mmask-t=long
|
|
||||||
--disable-ext-colors
|
|
||||||
--disable-ext-mouse
|
|
||||||
--without-pthread
|
|
||||||
--without-reentrant
|
|
||||||
)
|
|
||||||
|
|
||||||
# Force bash until upstream rebuilds the configure script with a newer
|
|
||||||
# version of autotools. #545532
|
|
||||||
CONFIG_SHELL=/bin/bash econf "${conf[@]}" "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
# when cross-compiling, we need to build up our own tic
|
|
||||||
# because people often don't keep matching host/target
|
|
||||||
# ncurses versions #249363
|
|
||||||
if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
|
|
||||||
make_flags="-C progs tic"
|
|
||||||
BUILD_DIR="${HOSTTIC_DIR}" do_compile cross
|
|
||||||
fi
|
|
||||||
|
|
||||||
multilib-minimal_src_compile
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_compile() {
|
|
||||||
make_flags=""
|
|
||||||
multilib_is_native_abi || make_flags="PROGS= "
|
|
||||||
do_compile narrowc
|
|
||||||
use unicode && do_compile widec
|
|
||||||
}
|
|
||||||
|
|
||||||
do_compile() {
|
|
||||||
cd "${BUILD_DIR}"-$1 || die
|
|
||||||
|
|
||||||
# A little hack to fix parallel builds ... they break when
|
|
||||||
# generating sources so if we generate the sources first (in
|
|
||||||
# non-parallel), we can then build the rest of the package
|
|
||||||
# in parallel. This is not really a perf hit since the source
|
|
||||||
# generation is quite small.
|
|
||||||
emake -j1 sources
|
|
||||||
# For some reason, sources depends on pc-files which depends on
|
|
||||||
# compiled libraries which depends on sources which ...
|
|
||||||
# Manually delete the pc-files file so the install step will
|
|
||||||
# create the .pc files we want.
|
|
||||||
rm -f misc/pc-files
|
|
||||||
emake ${make_flags}
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install() {
|
|
||||||
# use the cross-compiled tic (if need be) #249363
|
|
||||||
export PATH="${HOSTTIC_DIR}-cross/progs:${PATH}"
|
|
||||||
|
|
||||||
# install unicode version second so that the binaries in /usr/bin
|
|
||||||
# support both wide and narrow
|
|
||||||
cd "${BUILD_DIR}"-narrowc || die
|
|
||||||
emake DESTDIR="${D}" install
|
|
||||||
if use unicode ; then
|
|
||||||
cd "${BUILD_DIR}"-widec || die
|
|
||||||
emake DESTDIR="${D}" install
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Move libncurses{,w} into /lib
|
|
||||||
multilib_is_native_abi && gen_usr_ldscript -a \
|
|
||||||
ncurses \
|
|
||||||
$(usex unicode 'ncursesw' '') \
|
|
||||||
$(use tinfo && usex unicode 'tinfow' '') \
|
|
||||||
$(usev tinfo)
|
|
||||||
if ! tc-is-static-only ; then
|
|
||||||
ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
|
|
||||||
fi
|
|
||||||
use static-libs || find "${ED}"/usr/ -name '*.a' -a '!' -name '*curses++*.a' -delete
|
|
||||||
|
|
||||||
# Build fails to create this ...
|
|
||||||
dosym ../share/terminfo /usr/$(get_libdir)/terminfo
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install_all() {
|
|
||||||
if ! use symlink-usr ; then
|
|
||||||
# We need the basic terminfo files in /etc, bug #37026
|
|
||||||
einfo "Installing basic terminfo files in /etc..."
|
|
||||||
for x in "${MINIMAL_TERMINFO[@]}" ; do
|
|
||||||
local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
|
|
||||||
local basedir=$(basename $(dirname "${termfile}"))
|
|
||||||
|
|
||||||
if [[ -n ${termfile} ]] ; then
|
|
||||||
dodir /etc/terminfo/${basedir}
|
|
||||||
mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
|
|
||||||
dosym ../../../../etc/terminfo/${basedir}/${x} \
|
|
||||||
/usr/share/terminfo/${basedir}/${x}
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
|
|
||||||
doenvd "${T}"/50ncurses
|
|
||||||
|
|
||||||
use minimal && rm -r "${ED}"/usr/share/terminfo*
|
|
||||||
# Because ncurses5-config --terminfo returns the directory we keep it
|
|
||||||
keepdir /usr/share/terminfo #245374
|
|
||||||
elif use minimal; then
|
|
||||||
# prune all files and symlinks not listed in MINIMAL_TERMINFO
|
|
||||||
find "${D}"/usr/share/terminfo ! -type d \
|
|
||||||
${MINIMAL_TERMINFO[@]/#/! -name } \
|
|
||||||
-delete || die
|
|
||||||
find "${D}"/usr/share/terminfo -type d -empty -delete || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd "${S}"
|
|
||||||
dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
|
|
||||||
use doc && dohtml -r doc/html/
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
# Copyright 1999-2015 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
# Bridge the old SLOT=5[/5] ebuild to the new SLOT=0/5 since the slotmove
|
|
||||||
# functionality does not handle implicit subslots correctly. #558856
|
|
||||||
|
|
||||||
EAPI="5"
|
|
||||||
|
|
||||||
inherit multilib-build
|
|
||||||
|
|
||||||
DESCRIPTION="transitional package"
|
|
||||||
HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
|
|
||||||
|
|
||||||
LICENSE="metapackage"
|
|
||||||
SLOT="5/5"
|
|
||||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
|
||||||
IUSE="ada +cxx gpm static-libs tinfo unicode"
|
|
||||||
|
|
||||||
DEPEND="sys-libs/ncurses:0/5[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
|
|
||||||
RDEPEND="${DEPEND}"
|
|
||||||
296
sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-6.1-r2.ebuild
vendored
Normal file
296
sdk_container/src/third_party/coreos-overlay/sys-libs/ncurses/ncurses-6.1-r2.ebuild
vendored
Normal file
@ -0,0 +1,296 @@
|
|||||||
|
# Copyright 1999-2018 Gentoo Foundation
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
|
||||||
|
inherit flag-o-matic toolchain-funcs multilib-minimal
|
||||||
|
|
||||||
|
MY_PV=${PV:0:3}
|
||||||
|
PV_SNAP=${PV:4}
|
||||||
|
MY_P=${PN}-${MY_PV}
|
||||||
|
DESCRIPTION="console display library"
|
||||||
|
HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
|
||||||
|
SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="MIT"
|
||||||
|
# The subslot reflects the SONAME.
|
||||||
|
SLOT="0/6"
|
||||||
|
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
|
||||||
|
IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
|
||||||
|
|
||||||
|
DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
|
||||||
|
# berkdb? ( sys-libs/db )"
|
||||||
|
# Block the older ncurses that installed all files w/SLOT=5. #557472
|
||||||
|
RDEPEND="${DEPEND}
|
||||||
|
!<=sys-libs/ncurses-5.9-r4:5
|
||||||
|
!<sys-libs/slang-2.3.2_pre23
|
||||||
|
!<x11-terms/rxvt-unicode-9.06-r3
|
||||||
|
!<x11-terms/st-0.6-r1
|
||||||
|
!app-emulation/emul-linux-x86-baselibs"
|
||||||
|
|
||||||
|
S=${WORKDIR}/${MY_P}
|
||||||
|
|
||||||
|
PATCHES=(
|
||||||
|
"${FILESDIR}/${PN}-6.0-gfbsd.patch"
|
||||||
|
"${FILESDIR}/${PN}-5.7-nongnu.patch"
|
||||||
|
"${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
|
||||||
|
"${FILESDIR}/${PN}-6.0-pkg-config.patch"
|
||||||
|
"${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114
|
||||||
|
"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
|
||||||
|
"${FILESDIR}/${PN}-6.0-cppflags-cross.patch" #601426
|
||||||
|
"${FILESDIR}/${PN}-6.1-st07_terminfo_typo.patch" #651494
|
||||||
|
)
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
[[ -n ${PV_SNAP} ]] && eapply "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
|
||||||
|
default
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
unset TERMINFO #115036
|
||||||
|
tc-export_build_env BUILD_{CC,CPP}
|
||||||
|
BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
|
||||||
|
|
||||||
|
# Build the various variants of ncurses -- narrow, wide, and threaded. #510440
|
||||||
|
# Order matters here -- we want unicode/thread versions to come last so that the
|
||||||
|
# binaries in /usr/bin support both wide and narrow.
|
||||||
|
# The naming is also important as we use these directly with filenames and when
|
||||||
|
# checking configure flags.
|
||||||
|
NCURSES_TARGETS=(
|
||||||
|
ncurses
|
||||||
|
$(usex unicode 'ncursesw' '')
|
||||||
|
$(usex threads 'ncursest' '')
|
||||||
|
$(use unicode && usex threads 'ncursestw' '')
|
||||||
|
)
|
||||||
|
|
||||||
|
# When installing ncurses, we have to use a compatible version of tic.
|
||||||
|
# This comes up when cross-compiling, doing multilib builds, upgrading,
|
||||||
|
# or installing for the first time. Build a local copy of tic whenever
|
||||||
|
# the host version isn't available. #249363 #557598
|
||||||
|
if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
|
||||||
|
local lbuildflags="-static"
|
||||||
|
|
||||||
|
# some toolchains don't quite support static linking
|
||||||
|
local dbuildflags="-Wl,-rpath,${WORKDIR}/lib"
|
||||||
|
case ${CHOST} in
|
||||||
|
*-darwin*) dbuildflags= ;;
|
||||||
|
*-aix*) dbuildflags= ;;
|
||||||
|
esac
|
||||||
|
echo "int main() {}" | \
|
||||||
|
$(tc-getCC) -o x -x c - ${lbuildflags} -pipe >& /dev/null \
|
||||||
|
|| lbuildflags="${dbuildflags}"
|
||||||
|
|
||||||
|
# We can't re-use the multilib BUILD_DIR because we run outside of it.
|
||||||
|
BUILD_DIR="${WORKDIR}" \
|
||||||
|
CHOST=${CBUILD} \
|
||||||
|
CFLAGS=${BUILD_CFLAGS} \
|
||||||
|
CXXFLAGS=${BUILD_CXXFLAGS} \
|
||||||
|
CPPFLAGS=${BUILD_CPPFLAGS} \
|
||||||
|
LDFLAGS="${BUILD_LDFLAGS} ${lbuildflags}" \
|
||||||
|
do_configure cross --without-shared --with-normal
|
||||||
|
fi
|
||||||
|
multilib-minimal_src_configure
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_configure() {
|
||||||
|
local t
|
||||||
|
for t in "${NCURSES_TARGETS[@]}" ; do
|
||||||
|
do_configure "${t}"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
do_configure() {
|
||||||
|
local target=$1
|
||||||
|
shift
|
||||||
|
|
||||||
|
mkdir "${BUILD_DIR}/${target}"
|
||||||
|
cd "${BUILD_DIR}/${target}" || die
|
||||||
|
|
||||||
|
local conf=(
|
||||||
|
# We need the basic terminfo files in /etc, bug #37026. We will
|
||||||
|
# add '--with-terminfo-dirs' and then populate /etc/terminfo in
|
||||||
|
# src_install() ...
|
||||||
|
--with-terminfo-dirs="${EPREFIX}/etc/terminfo:${EPREFIX}/usr/share/terminfo"
|
||||||
|
|
||||||
|
# Disabled until #245417 is sorted out.
|
||||||
|
#$(use_with berkdb hashed-db)
|
||||||
|
|
||||||
|
# Enable installation of .pc files.
|
||||||
|
--enable-pc-files
|
||||||
|
# This path is used to control where the .pc files are installed.
|
||||||
|
--with-pkg-config-libdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
|
||||||
|
|
||||||
|
# Now the rest of the various standard flags.
|
||||||
|
--with-shared
|
||||||
|
--without-hashed-db
|
||||||
|
$(use_with ada)
|
||||||
|
$(use_with cxx)
|
||||||
|
$(use_with cxx cxx-binding)
|
||||||
|
--with-cxx-shared
|
||||||
|
$(use_with debug)
|
||||||
|
$(use_with profile)
|
||||||
|
# The configure script uses ldd to parse the linked output which
|
||||||
|
# is flaky for cross-compiling/multilib/ldd versions/etc...
|
||||||
|
$(use_with gpm gpm libgpm.so.1)
|
||||||
|
# Required for building on mingw-w64, and possibly other windows
|
||||||
|
# platforms, bug #639670
|
||||||
|
$(use_enable kernel_Winnt term-driver)
|
||||||
|
--disable-termcap
|
||||||
|
--enable-symlinks
|
||||||
|
--with-rcs-ids
|
||||||
|
--with-manpage-format=normal
|
||||||
|
--enable-const
|
||||||
|
--enable-colorfgbg
|
||||||
|
--enable-hard-tabs
|
||||||
|
--enable-echo
|
||||||
|
$(use_enable !ada warnings)
|
||||||
|
$(use_with debug assertions)
|
||||||
|
$(use_enable !debug leaks)
|
||||||
|
$(use_with debug expanded)
|
||||||
|
$(use_with !debug macros)
|
||||||
|
$(multilib_native_with progs)
|
||||||
|
$(use_with test tests)
|
||||||
|
$(use_with trace)
|
||||||
|
$(use_with tinfo termlib)
|
||||||
|
--disable-stripping
|
||||||
|
)
|
||||||
|
|
||||||
|
if [[ ${target} == ncurses*w ]] ; then
|
||||||
|
conf+=( --enable-widec )
|
||||||
|
else
|
||||||
|
conf+=( --disable-widec )
|
||||||
|
fi
|
||||||
|
if [[ ${target} == ncursest* ]] ; then
|
||||||
|
conf+=( --with-{pthread,reentrant} )
|
||||||
|
else
|
||||||
|
conf+=( --without-{pthread,reentrant} )
|
||||||
|
fi
|
||||||
|
# Make sure each variant goes in a unique location.
|
||||||
|
if [[ ${target} == "ncurses" ]] ; then
|
||||||
|
# "ncurses" variant goes into "${EPREFIX}"/usr/include
|
||||||
|
# It is needed on Prefix because the configure script appends
|
||||||
|
# "ncurses" to "${prefix}/include" if "${prefix}" is not /usr.
|
||||||
|
conf+=( --enable-overwrite )
|
||||||
|
else
|
||||||
|
conf+=( --includedir="${EPREFIX}"/usr/include/${target} )
|
||||||
|
fi
|
||||||
|
# See comments in src_configure.
|
||||||
|
if [[ ${target} != "cross" ]] ; then
|
||||||
|
local cross_path="${WORKDIR}/cross"
|
||||||
|
[[ -d ${cross_path} ]] && export TIC_PATH="${cross_path}/progs/tic"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Force bash until upstream rebuilds the configure script with a newer
|
||||||
|
# version of autotools. #545532
|
||||||
|
CONFIG_SHELL=${EPREFIX}/bin/bash \
|
||||||
|
ECONF_SOURCE="${S}" \
|
||||||
|
econf "${conf[@]}" "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
# See comments in src_configure.
|
||||||
|
if ! ROOT=/ has_version "~sys-libs/${P}:0" ; then
|
||||||
|
BUILD_DIR="${WORKDIR}" \
|
||||||
|
do_compile cross -C progs tic
|
||||||
|
fi
|
||||||
|
|
||||||
|
multilib-minimal_src_compile
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_compile() {
|
||||||
|
local t
|
||||||
|
for t in "${NCURSES_TARGETS[@]}" ; do
|
||||||
|
do_compile "${t}"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
do_compile() {
|
||||||
|
local target=$1
|
||||||
|
shift
|
||||||
|
|
||||||
|
cd "${BUILD_DIR}/${target}" || die
|
||||||
|
|
||||||
|
# A little hack to fix parallel builds ... they break when
|
||||||
|
# generating sources so if we generate the sources first (in
|
||||||
|
# non-parallel), we can then build the rest of the package
|
||||||
|
# in parallel. This is not really a perf hit since the source
|
||||||
|
# generation is quite small.
|
||||||
|
emake -j1 sources
|
||||||
|
# For some reason, sources depends on pc-files which depends on
|
||||||
|
# compiled libraries which depends on sources which ...
|
||||||
|
# Manually delete the pc-files file so the install step will
|
||||||
|
# create the .pc files we want.
|
||||||
|
rm -f misc/pc-files
|
||||||
|
emake "$@"
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install() {
|
||||||
|
local target
|
||||||
|
for target in "${NCURSES_TARGETS[@]}" ; do
|
||||||
|
emake -C "${BUILD_DIR}/${target}" DESTDIR="${D}" install
|
||||||
|
done
|
||||||
|
|
||||||
|
# Move main libraries into /.
|
||||||
|
if multilib_is_native_abi ; then
|
||||||
|
gen_usr_ldscript -a \
|
||||||
|
"${NCURSES_TARGETS[@]}" \
|
||||||
|
$(use tinfo && usex unicode 'tinfow' '') \
|
||||||
|
$(usev tinfo)
|
||||||
|
fi
|
||||||
|
if ! tc-is-static-only ; then
|
||||||
|
# Provide a link for -lcurses.
|
||||||
|
ln -sf libncurses$(get_libname) "${ED}"/usr/$(get_libdir)/libcurses$(get_libname) || die
|
||||||
|
fi
|
||||||
|
# don't delete '*.dll.a', needed for linking #631468
|
||||||
|
if ! use static-libs; then
|
||||||
|
find "${ED}"/usr/ -name '*.a' ! -name '*.dll.a' -delete || die
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Build fails to create this ...
|
||||||
|
dosym ../share/terminfo /usr/$(get_libdir)/terminfo
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install_all() {
|
||||||
|
# if ! use berkdb ; then
|
||||||
|
# We need the basic terminfo files in /etc, bug #37026
|
||||||
|
einfo "Installing basic terminfo files in /etc..."
|
||||||
|
local x
|
||||||
|
for x in ansi console dumb linux rxvt rxvt-unicode screen{,-256color} vt{52,100,102,200,220} \
|
||||||
|
xterm xterm-{,256}color
|
||||||
|
do
|
||||||
|
local termfile=$(find "${ED}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
|
||||||
|
local basedir=$(basename $(dirname "${termfile}"))
|
||||||
|
|
||||||
|
if [[ -n ${termfile} ]] ; then
|
||||||
|
dodir /etc/terminfo/${basedir}
|
||||||
|
mv ${termfile} "${ED}"/etc/terminfo/${basedir}/
|
||||||
|
dosym ../../../../etc/terminfo/${basedir}/${x} \
|
||||||
|
/usr/share/terminfo/${basedir}/${x}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
# fi
|
||||||
|
|
||||||
|
echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
|
||||||
|
doenvd "${T}"/50ncurses
|
||||||
|
|
||||||
|
use minimal && rm -r "${ED}"/usr/share/terminfo*
|
||||||
|
# Because ncurses5-config --terminfo returns the directory we keep it
|
||||||
|
keepdir /usr/share/terminfo #245374
|
||||||
|
|
||||||
|
cd "${S}"
|
||||||
|
dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
|
||||||
|
if use doc ; then
|
||||||
|
docinto html
|
||||||
|
dohtml -r doc/html/
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_preinst() {
|
||||||
|
preserve_old_lib /$(get_libdir)/libncurses.so.5
|
||||||
|
use unicode && preserve_old_lib /$(get_libdir)/libncursesw.so.5
|
||||||
|
}
|
||||||
|
|
||||||
|
pkg_postinst() {
|
||||||
|
preserve_old_lib_notify /$(get_libdir)/libncurses.so.5
|
||||||
|
use unicode && preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user