From 0bb8253b38dc8638a46b66ba909c1bfd1054e1ef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 4 Nov 2022 09:13:50 +0000 Subject: gentoo auto-resync : 04:11:2022 - 09:13:50 --- dev-lang/tcl/Manifest | 3 +- .../tcl/files/tcl-8.6.12-configure-clang16.patch | 31 ++++++ dev-lang/tcl/tcl-8.6.12-r1.ebuild | 124 +++++++++++++++++++++ dev-lang/tcl/tcl-8.6.12.ebuild | 123 -------------------- 4 files changed, 157 insertions(+), 124 deletions(-) create mode 100644 dev-lang/tcl/files/tcl-8.6.12-configure-clang16.patch create mode 100644 dev-lang/tcl/tcl-8.6.12-r1.ebuild delete mode 100644 dev-lang/tcl/tcl-8.6.12.ebuild (limited to 'dev-lang/tcl') diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest index c0aa157b32ae..23e5aac2adfd 100644 --- a/dev-lang/tcl/Manifest +++ b/dev-lang/tcl/Manifest @@ -1,8 +1,9 @@ AUX tcl-8.6.10-multilib.patch 382 BLAKE2B 048865231ab45fefcd7bf708ba301809f358d7eddc45adc108c022768887ffb3e9912de9ab4ab4822453efe5c70a435ebcd61d7aedaf796b4b00b574ae6a318e SHA512 d0500d5dd7ae2f382221fd4f1a63d2ef689023b8873f6682f87b482ef601bd881a16321c02010067ae0a50e70ea75ccdb8b34753d809e9f7d591c279d344d6be +AUX tcl-8.6.12-configure-clang16.patch 1189 BLAKE2B 60a7b0262bc74ab0942d87d59b60db55d0eb56fdf2f117487079adb22a11d018e5bcd1bcd43ac974948710fa75b4e7e28e987e3fd8b12b1687e4bebfdae0c8fc SHA512 61749c22365a9b08301729a36dcb732ac773430b29a81e87a86fceab381e3b27c68f24eaefa0fffd6d1946fa5e1c30529178f63e4aae9b196d1178349aacb77c AUX tcl-8.6.8-conf.patch 401 BLAKE2B 278502e983b8c831a2bfe5e61c31d32181558aaebccb2c7a64c52c387ce674ad1543dcedb7b73bfa748e8b40424a59e4696057e3a7f6d0e9f7ddbe838473995f SHA512 8524f80bb54851fc28f1994cbbd9c78756f9f9b1ca31a2f602e2cc557bbb22093bb6cce0ce5099cb90847f3c0ed20503a3d122abb400482869afd2469b3867b8 AUX tcl-8.6.9-include-spec.patch 488 BLAKE2B 06aa49163e8316b409238055d4b2ef67a3b37bdad69a190d39ce46a32dbd38320397b206036428c81e4a001ee0c01ee70f5970f584f919d0e5348000c7f93711 SHA512 ca4fc3ca2b3963d9c1b9b1c716e9c508d8c7aeaaad4b39c502472f3592c60907dbcda656369af371ec6c21f06a6dbc50fa02994a15284bedbdb22616ca9340ba DIST tcl-core8.6.11-src.tar.gz 6041050 BLAKE2B 9c41d5ae5d22627b903d18c5ca607d4a2647d7af65d3029a463cf571d3fbe0bd48e15fef643e81de94296777985a36530a83718d4eb7befca4bc107ab860cc0d SHA512 fe3556c37305e3856743e9a202a320d44b1b3cbc926a1b7a4449ae5baf2f8df92214a9aa06f0a87645d032857fb71458fc864ff007fd73da60463ae5001f2d3f DIST tcl-core8.6.12-src.tar.gz 6064625 BLAKE2B 30dc780562aa6955e2c417798cc96fabd23e947cee81146dc192156598e3c43f588864aab4392d62901b8964cf59bedb6cad1f064e32b03dd9733b3a0a7b5c8a SHA512 7144a50d19d3855edbda14b538cc94fe26c0dd357b979676c3fe02d599dab61ba777bf14f6aaebb63e238aeff1d0bad25ea7b0ff31b2398468f67fc0a305b9f3 EBUILD tcl-8.6.11.ebuild 4016 BLAKE2B 761335036c4f86499dea605a7659b5b4d7d95d1c8ab78bc0aab0edc2bf23e42eea316251b6a6a92e1ec504955b19fafaeb4722230f7e1dc9ec04ef6b3ccb7684 SHA512 0e8bbf84e92819348121919dc625d410b5be4d921230ec11d4bdf14d1debc6e2f39517a2c53c02fbc95127b1347e0e53ab6fe3f0efdbe9cdad5c7b5bd4eebb48 -EBUILD tcl-8.6.12.ebuild 3538 BLAKE2B a8184cc2c44a8778e7449ac31ef8c1e8306080986ebe1cabaead12d6196e78f2b0b51b38168cb92271d52e6ecaaa6ace7b03ce45cec337dedfa0cf92031aa8d7 SHA512 8088e1da04711a211cd30668985e67ed95d8038ba8bc8f57a62b40be7ada762bca4e984a5da27c99eae25b9ff78d849303f6efe3e59f3c7a750f982ba5bf736b +EBUILD tcl-8.6.12-r1.ebuild 3582 BLAKE2B 0707ddc347ec31ad3dd191819ffe5c39a20b49119faf545ab844d84c736279d23b52aef2828caa696f8972b356dea8d767edf52cc1aabf931f88fd47f106f59f SHA512 592504326ec61ccdac6a712c66e5a9d5137ffba1fce2f49dba798fc6e67acf441dbcafe3f455f96c7bf6ce951f4641e6740b36a4563ec58ccc36404ad07c18dd MISC metadata.xml 421 BLAKE2B c056a7ae8f2deaddda9bb329d46ec4f322548f4d031479ba522f5d93add46bd47cc783e9876b398579898af2cbdedb053c6328433eacfd02df4bb6dcf0185766 SHA512 0e77b876a127d68c7b193db874b9d3ab38f8475abafec1d866f2a4158ea4334ae04fbd6cb1d9acc23c81e13e584fe667503e4d9352873e1880a2d6acf7dec59c diff --git a/dev-lang/tcl/files/tcl-8.6.12-configure-clang16.patch b/dev-lang/tcl/files/tcl-8.6.12-configure-clang16.patch new file mode 100644 index 000000000000..8714faccbe1b --- /dev/null +++ b/dev-lang/tcl/files/tcl-8.6.12-configure-clang16.patch @@ -0,0 +1,31 @@ +https://github.com/tcltk/tcl/commit/5eb33c5c7e9d6b703275b680f337691ecfe38f2a + +From 5eb33c5c7e9d6b703275b680f337691ecfe38f2a Mon Sep 17 00:00:00 2001 +From: "jan.nijtmans" +Date: Sun, 7 Nov 2021 21:34:08 +0000 +Subject: [PATCH] Fix [15845d9fd8]: unix/tcl.m4: implicit declaration of exit() + in timezone variable checks + +--- a/unix/tcl.m4 ++++ b/unix/tcl.m4 +@@ -2349,7 +2349,8 @@ AC_DEFUN([SC_TIME_HANDLER], [ + # (like convex) have timezone functions, etc. + # + AC_CACHE_CHECK([long timezone variable], tcl_cv_timezone_long, [ +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ++#include ]], + [[extern long timezone; + timezone += 1; + exit (0);]])], +@@ -2361,7 +2362,8 @@ AC_DEFUN([SC_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_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ++#include ]], + [[extern time_t timezone; + timezone += 1; + exit (0);]])], + diff --git a/dev-lang/tcl/tcl-8.6.12-r1.ebuild b/dev-lang/tcl/tcl-8.6.12-r1.ebuild new file mode 100644 index 000000000000..c7bd860d3075 --- /dev/null +++ b/dev-lang/tcl/tcl-8.6.12-r1.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with dev-lang/tk! + +inherit autotools flag-o-matic multilib-minimal multilib toolchain-funcs + +MY_P="${PN}${PV}" + +DESCRIPTION="Tool Command Language" +HOMEPAGE="http://www.tcl.tk/" +SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz" + +LICENSE="tcltk" +SLOT="0/8.6" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug +threads" + +RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND}" + +SPARENT="${WORKDIR}/${MY_P}" +S="${SPARENT}"/unix + +PATCHES=( + "${FILESDIR}"/${PN}-8.6.10-multilib.patch + "${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971 + "${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120 + "${FILESDIR}"/${P}-configure-clang16.patch +) + +src_prepare() { + find \ + "${SPARENT}"/compat/* \ + "${SPARENT}"/doc/try.n \ + -delete || die + + pushd "${SPARENT}" &>/dev/null || die + default + popd &>/dev/null || die + + # httpold tests require netowk + rm ../tests/httpold.test \ + ../tests/env.test \ + ../tests/http.test \ + || die + + # workaround stack check issues, bug #280934 + use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" + + tc-export CC + + sed \ + -e '/chmod/s:555:755:g' \ + -i Makefile.in || die + + sed \ + -e 's:-O[2s]\?::g' \ + -i tcl.m4 || die + + mv configure.{in,ac} || die + + eautoconf + + multilib_copy_sources +} + +multilib_src_configure() { + # We went ahead and deleted the whole compat/ subdir which means + # the configure tests to detect broken versions need to pass (else + # we'll fail to build). This comes up when cross-compiling, but + # might as well get a minor configure speed up normally. + export ac_cv_func_memcmp_working="yes" + export tcl_cv_str{str,toul,tod}_unbroken="ok" + export tcl_cv_strtod_buggy="no" + + econf \ + $(use_enable threads) \ + $(use_enable debug symbols) +} + +multilib_src_install() { + #short version number + local v1=$(ver_cut 1-2) + local mylibdir=$(get_libdir) + + S= default + # fix the tclConfig.sh to eliminate refs to the build directory + # and drop unnecessary -L inclusion to default system libdir + + sed \ + -e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \ + -e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \ + -e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \ + -e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ + -e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ + -e "/^TCL_LIBW_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ + -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die + if use prefix && [[ ${CHOST} != *-darwin* ]] ; then + sed \ + -e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ + -e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ + -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die + fi + + # install private headers + insinto /usr/${mylibdir}/tcl${v1}/include/unix + doins *.h + insinto /usr/${mylibdir}/tcl${v1}/include/generic + doins "${SPARENT}"/generic/*.h + rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die + + # install symlink for libraries + dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) + dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a + + if multilib_is_native_abi; then + dosym tclsh${v1} /usr/bin/tclsh + dodoc "${SPARENT}"/{ChangeLog*,README.md,changes} + fi +} diff --git a/dev-lang/tcl/tcl-8.6.12.ebuild b/dev-lang/tcl/tcl-8.6.12.ebuild deleted file mode 100644 index 35226b4ca7ca..000000000000 --- a/dev-lang/tcl/tcl-8.6.12.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Please bump with dev-lang/tk! - -inherit autotools flag-o-matic multilib-minimal multilib toolchain-funcs - -MY_P="${PN}${PV}" - -DESCRIPTION="Tool Command Language" -HOMEPAGE="http://www.tcl.tk/" -SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz" - -LICENSE="tcltk" -SLOT="0/8.6" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug +threads" - -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" - -SPARENT="${WORKDIR}/${MY_P}" -S="${SPARENT}"/unix - -PATCHES=( - "${FILESDIR}"/${PN}-8.6.10-multilib.patch - "${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971 - "${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120 -) - -src_prepare() { - find \ - "${SPARENT}"/compat/* \ - "${SPARENT}"/doc/try.n \ - -delete || die - - pushd "${SPARENT}" &>/dev/null || die - default - popd &>/dev/null || die - - # httpold tests require netowk - rm ../tests/httpold.test \ - ../tests/env.test \ - ../tests/http.test \ - || die - - # workaround stack check issues, bug #280934 - use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" - - tc-export CC - - sed \ - -e '/chmod/s:555:755:g' \ - -i Makefile.in || die - - sed \ - -e 's:-O[2s]\?::g' \ - -i tcl.m4 || die - - mv configure.{in,ac} || die - - eautoconf - - multilib_copy_sources -} - -multilib_src_configure() { - # We went ahead and deleted the whole compat/ subdir which means - # the configure tests to detect broken versions need to pass (else - # we'll fail to build). This comes up when cross-compiling, but - # might as well get a minor configure speed up normally. - export ac_cv_func_memcmp_working="yes" - export tcl_cv_str{str,toul,tod}_unbroken="ok" - export tcl_cv_strtod_buggy="no" - - econf \ - $(use_enable threads) \ - $(use_enable debug symbols) -} - -multilib_src_install() { - #short version number - local v1=$(ver_cut 1-2) - local mylibdir=$(get_libdir) - - S= default - # fix the tclConfig.sh to eliminate refs to the build directory - # and drop unnecessary -L inclusion to default system libdir - - sed \ - -e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \ - -e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \ - -e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \ - -e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ - -e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ - -e "/^TCL_LIBW_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ - -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die - if use prefix && [[ ${CHOST} != *-darwin* ]] ; then - sed \ - -e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ - -e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ - -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die - fi - - # install private headers - insinto /usr/${mylibdir}/tcl${v1}/include/unix - doins *.h - insinto /usr/${mylibdir}/tcl${v1}/include/generic - doins "${SPARENT}"/generic/*.h - rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die - - # install symlink for libraries - dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) - dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a - - if multilib_is_native_abi; then - dosym tclsh${v1} /usr/bin/tclsh - dodoc "${SPARENT}"/{ChangeLog*,README.md,changes} - fi -} -- cgit v1.2.3