From 6330245077f9f298a785e17756a8f59a843361a5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Nov 2022 00:57:34 +0000 Subject: gentoo auto-resync : 18:11:2022 - 00:57:34 --- dev-tcltk/expect/Manifest | 2 + dev-tcltk/expect/expect-5.45.4-r4.ebuild | 79 ++++++++ .../files/expect-5.45.4-configure-clang16.patch | 223 +++++++++++++++++++++ 3 files changed, 304 insertions(+) create mode 100644 dev-tcltk/expect/expect-5.45.4-r4.ebuild create mode 100644 dev-tcltk/expect/files/expect-5.45.4-configure-clang16.patch (limited to 'dev-tcltk/expect') diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest index febbe8482b39..c3fa92efbc6d 100644 --- a/dev-tcltk/expect/Manifest +++ b/dev-tcltk/expect/Manifest @@ -3,9 +3,11 @@ AUX expect-5.45-darwin-install_name.patch 727 BLAKE2B fca6df8c6d01bd54f26e6a2311 AUX expect-5.45-format-security.patch 428 BLAKE2B 98e4d1da9f790bb1ab1b0b8481c5c0a747823f0998fff7993316d44cd5b29659467901c9f2e78d6b77342a9f0cb9072730a8600240fa37f240e10cc677162f63 SHA512 b85f0985b908f72d960eeb00567caab048874806c68d259835dc4564e33032524e9026e07ece3ad5f8669d67f7976019efb5dd763ba84b4cc13571ca999c7f06 AUX expect-5.45-gfbsd.patch 996 BLAKE2B 46183afae664e2995403e36b423e0576022063d8acfb681dd98d6e98e54c86588f0e74067b929fe105bc477fedd8709b749857dcdaf5e57fa28445dad34c4139 SHA512 4fa7c4723c9ad2f5811c5762abe202f1d7584a6050c75cab277fe1b6c697809204a9adcf6f6f6c3c215c8df32f3ac9b083da907777b1ea02e1a4e64b8bf91242 AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb308e737995944b7e081a06a4d6b6f3409836b28835e6534ef57215542b524061cb731be3b419b23ab2ba38184079 SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c +AUX expect-5.45.4-configure-clang16.patch 5377 BLAKE2B dd8a65e98e269f3b3ca086099b1c0cc62fda2357f7441c59f7cad8c168a4d8417bb05ba4e58fd9d2018d01ba66cd72ca0d63fc45e728363032412deb7f5283fb SHA512 34fd8c2a4986a0e085f69a2cb34afeeab3b6e2689cf88793149c8a8d98c1700f15df3b9ad27c74555572928c3e6a577ae44fa4af0b5b82afc7f1e5539d66c6e7 AUX expect-5.45.4-configure-in.patch 2408 BLAKE2B d198b599eeff18833e9532945aaf921779229ddecfbe478f985f2d742a39875e68cdca97fbca6aa5ca572f4c31c3a2491c8ddf473042952213232d3bfd070eee SHA512 7b60a268c6e4c0875978a619a451eb669a519f74623fbcecd90299b22e0ba73f6884177a16367e5ee94828c55636dba2f70c324576c1cc077d389912f4d7409d AUX expect-5.45.4-examples.patch 935 BLAKE2B df87d211f6693b836e2e8ca2b63c56a9dd073a8e2ab3f71b38523d4797da0c54411d51bd38e5568c0b850b30ce89d7c984945e704486eb61ca5077709de514fc SHA512 0cad9007f82d2e9fb1994e7b8a84858603cca471f34dbbaddadc30b4594c5cb31cb29749629bcea47b1da4abe3526ddc1c5ea36fb816571bc9c6ffadc120667c DIST expect5.45.4.tar.gz 632363 BLAKE2B a3a936e7644c922fdd474fa08c45926396ccce9a63e5f65f4d5e157f5160cfe4de47688734b39d13281d9548aac492810f19236e06563903d3d8081e4661048d SHA512 a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a EBUILD expect-5.45.4-r2.ebuild 2290 BLAKE2B 246066fe262ed78dc68f688a7c2f387909b82c7475035f4eb9a9f4af1b9f1ee3460b338bdf5c121c5fff6fe2bb37941aa5163cca6268ae4e87085ac0c1310305 SHA512 216fec55a13569db6238145bef190c13e4e38759679c2088b6f148149f8620e10db8f4f100ab2308dd29c0b0ada3a6df7992c31f36ab1fc7ca2a91c7cd459dac EBUILD expect-5.45.4-r3.ebuild 2351 BLAKE2B 7460c2607655969bdf217abfe9c0265be36af8363568a2b0c036245cbc5be3320ba84cb6f7c13a8ba7e92b861eed8a15ad6bc68b4e374ca08dcfa436ffb57c50 SHA512 b9bcebf936a5777d80f6c21095322e94d8e1897d3c29d920c4fabe5e6ab633439ed6ba51571ca3b446167a21683ebe3d4e127f211154273a48691bfe77d82ca3 +EBUILD expect-5.45.4-r4.ebuild 2137 BLAKE2B bffe75e2748b8e13585d835eea1e95cdb722967bbeade349bfe59712c2e6c1ba6f9b555af1bbff2d206ac11dff044cf3a36b682f9c0c7bb48eb7c53e69dd8f1c SHA512 d83e5980b5faf4e6271a9c6148ae70d5c2d8c6abee3b7f4ff19bff621a48c5a86f322245468f81224580ea1ee7e6a7c8781d0207047d6a4e4f65faec88842974 MISC metadata.xml 330 BLAKE2B 4e561b8ea0a607e2fde49595d4808e51b2df54c2d8f3d65c47a4e592e7d7897db71a6677b0330c7c32a8e5773b9571de0e4c8d33c4f8a5c3f0e0f7192082b177 SHA512 fec72aa15126bbe40bc5277bb743acf07203a6153ee52e69f1e828dfc53757b3d11a8e09175397a06bdb4f2c5e683db1ec74de254a6b36926192e5868f2e5ec6 diff --git a/dev-tcltk/expect/expect-5.45.4-r4.ebuild b/dev-tcltk/expect/expect-5.45.4-r4.ebuild new file mode 100644 index 000000000000..0241b8c3bc92 --- /dev/null +++ b/dev-tcltk/expect/expect-5.45.4-r4.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools edo flag-o-matic + +MY_P="${PN}${PV}" +DESCRIPTION="tool for automating interactive applications" +HOMEPAGE="https://core.tcl-lang.org/expect/" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="debug doc test threads" +RESTRICT="!test? ( test )" + +DEPEND=">=dev-lang/tcl-8.2:=[threads?]" +RDEPEND="${DEPEND}" +BDEPEND="test? ( dev-util/dejagnu )" + +PATCHES=( "${FILESDIR}"/${P}-examples.patch ) + +src_prepare() { + default + sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die + + eapply "${FILESDIR}"/${PN}-5.45-gfbsd.patch + eapply "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch + eapply "${FILESDIR}"/${PN}-5.45-headers.patch #337943 + eapply "${FILESDIR}"/${PN}-5.45-format-security.patch + eapply "${FILESDIR}"/${PN}-5.45.4-configure-in.patch + eapply "${FILESDIR}"/${PN}-5.45.4-configure-clang16.patch || die + + sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c || die + + # fix install_name on darwin + [[ ${CHOST} == *-darwin* ]] && \ + eapply "${FILESDIR}"/${P}-darwin-install_name.patch + + mv configure.{in,ac} || die + + eautoconf +} + +src_configure() { + # bug #881687 + append-flags -std=gnu89 + + # the 64bit flag is useless ... it only adds 64bit compiler flags + # (like -m64) which the target toolchain should already handle + econf \ + --with-tcl="${EPREFIX}/usr/$(get_libdir)" \ + --disable-64bit \ + --enable-shared \ + $(use_enable threads) \ + $(use_enable debug symbols mem) +} + +expect_make_var() { + touch pkgIndex.tcl-hand || die + printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f - + rm -f pkgIndex.tcl-hand || die +} + +src_install() { + default + + if use doc ; then + docinto examples + + edo dodoc \ + example/README \ + $(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \ + $(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES)) + fi +} diff --git a/dev-tcltk/expect/files/expect-5.45.4-configure-clang16.patch b/dev-tcltk/expect/files/expect-5.45.4-configure-clang16.patch new file mode 100644 index 000000000000..5d40e5ddf684 --- /dev/null +++ b/dev-tcltk/expect/files/expect-5.45.4-configure-clang16.patch @@ -0,0 +1,223 @@ +From 4c3a5051aa9706eea42dab31f9e121d975c08521 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Thu, 17 Nov 2022 20:20:45 +0000 +Subject: [PATCH] Fix configure with clang 16 + +Bug: https://bugs.gentoo.org/881687 +Signed-off-by: Sam James +--- a/configure.in ++++ b/configure.in +@@ -454,7 +454,7 @@ AC_CHECK_FUNC(siglongjmp, AC_DEFINE(HAVE_SIGLONGJMP)) + # because Unixware 2.0 handles it specially and refuses to compile + # autoconf's automatic test that is a call with no arguments + AC_MSG_CHECKING([for memcpy]) +-AC_TRY_LINK(,[ ++AC_TRY_LINK([#include ],[ + char *s1, *s2; + memcpy(s1,s2,0); + ], +@@ -471,7 +471,7 @@ memcpy(s1,s2,0); + AC_MSG_CHECKING([if WNOHANG requires _POSIX_SOURCE]) + AC_TRY_RUN([ + #include +-main() { ++int main(void) { + #ifndef WNOHANG + return 0; + #else +@@ -491,7 +491,7 @@ rm -rf wnohang + AC_TRY_RUN([ + #include + #include +-main() { ++int main(void) { + #ifdef WNOHANG + FILE *fp = fopen("wnohang","w"); + fprintf(fp,"%d",WNOHANG); +@@ -540,24 +540,23 @@ dnl AC_HEADER_EGREP([(void|sighandler_t).*signal], signal.h, retsigtype=void,AC_ + AC_MSG_CHECKING([if signals need to be re-armed]) + AC_TRY_RUN([ + #include +-#define RETSIGTYPE $retsigtype +- ++#include ++#include ++#include + int signal_rearms = 0; + + RETSIGTYPE +-child_sigint_handler(n) +-int n; ++child_sigint_handler(int n) + { + } + + RETSIGTYPE +-parent_sigint_handler(n) +-int n; ++parent_sigint_handler(int n) + { + signal_rearms++; + } + +-main() ++int main(void) + { + signal(SIGINT,parent_sigint_handler); + +@@ -719,7 +718,8 @@ fi + AC_MSG_CHECKING([for struct sgttyb]) + AC_TRY_RUN([ + #include +-main() ++#include ++int main(void) + { + struct sgttyb tmp; + exit(0); +@@ -745,7 +745,8 @@ if test $mach -eq 0 ; then + # pty_termios.c is set up to handle pty_termio. + AC_MSG_CHECKING([for struct termio]) + AC_TRY_RUN([#include +- main() ++ #include ++ int main(void) + { + struct termio tmp; + exit(0); +@@ -769,7 +770,8 @@ if test $mach -eq 0 ; then + # include + # endif + # include +- main() ++# include ++ int main(void) + { + struct termios tmp; + exit(0); +@@ -793,7 +795,7 @@ AC_TRY_RUN([ + #include + #endif + #include +-main() { ++int main(void) { + #if defined(TCGETS) || defined(TCGETA) + return 0; + #else +@@ -815,7 +817,7 @@ AC_TRY_RUN([ + #include + #endif + #include +-main() { ++int main(void) { + #ifdef TIOCGWINSZ + return 0; + #else +@@ -834,7 +836,7 @@ main() { + AC_MSG_CHECKING([for Cray-style ptys]) + SETUID=":" + AC_TRY_RUN([ +-main(){ ++int main(void) { + #ifdef CRAY + return 0; + #else +@@ -887,9 +889,10 @@ AC_FUNC_SETPGRP + # + AC_MSG_CHECKING([for SV-style timezone]) + AC_TRY_RUN([ ++#include + extern char *tzname[2]; + extern int daylight; +-main() ++int main(void) + { + int *x = &daylight; + char **y = tzname; +--- a/tclconfig/tcl.m4 ++++ b/tclconfig/tcl.m4 +@@ -2029,7 +2029,7 @@ AC_DEFUN([TEA_SERIAL_PORT], [ + AC_TRY_RUN([ + #include + +-int main() { ++int main(void) { + struct termios t; + if (tcgetattr(0, &t) == 0) { + cfsetospeed(&t, 0); +@@ -2042,7 +2042,7 @@ int main() { + AC_TRY_RUN([ + #include + +-int main() { ++int main(void) { + struct termio t; + if (ioctl(0, TCGETA, &t) == 0) { + t.c_cflag |= CBAUD | PARENB | PARODD | CSIZE | CSTOPB; +@@ -2055,7 +2055,7 @@ int main() { + AC_TRY_RUN([ + #include + +-int main() { ++int main(void) { + struct sgttyb t; + if (ioctl(0, TIOCGETP, &t) == 0) { + t.sg_ospeed = 0; +@@ -2070,7 +2070,7 @@ int main() { + #include + #include + +-int main() { ++int main(void) { + struct termios t; + if (tcgetattr(0, &t) == 0 + || errno == ENOTTY || errno == ENXIO || errno == EINVAL) { +@@ -2086,7 +2086,7 @@ int main() { + #include + #include + +-int main() { ++int main(void) { + struct termio t; + if (ioctl(0, TCGETA, &t) == 0 + || errno == ENOTTY || errno == ENXIO || errno == EINVAL) { +@@ -2101,7 +2101,7 @@ int main() { + #include + #include + +-int main() { ++int main(void) { + struct sgttyb t; + if (ioctl(0, TIOCGETP, &t) == 0 + || errno == ENOTTY || errno == ENXIO || errno == EINVAL) { +@@ -2392,7 +2392,9 @@ AC_DEFUN([TEA_TIME_HANDLER], [ + # (like convex) have timezone functions, etc. + # + AC_CACHE_CHECK([long timezone variable], tcl_cv_timezone_long, [ +- AC_TRY_COMPILE([#include ], ++ AC_TRY_COMPILE([#include ++ #include ++ ], + [extern long timezone; + timezone += 1; + exit (0);], +@@ -2404,7 +2406,9 @@ AC_DEFUN([TEA_TIME_HANDLER], [ + # On some systems (eg IRIX 6.2), timezone is a time_t and not a long. + # + AC_CACHE_CHECK([time_t timezone variable], tcl_cv_timezone_time, [ +- AC_TRY_COMPILE([#include ], ++ AC_TRY_COMPILE([#include ++ #include ++ ], + [extern time_t timezone; + timezone += 1; + exit (0);], +@@ -2441,7 +2445,7 @@ AC_DEFUN([TEA_BUGGY_STRTOD], [ + AC_CACHE_CHECK([for Solaris2.4/Tru64 strtod bugs], tcl_cv_strtod_buggy,[ + AC_TRY_RUN([ + extern double strtod(); +- int main() { ++ int main(void) { + char *infString="Inf", *nanString="NaN", *spaceString=" "; + char *term; + double value; -- cgit v1.2.3