| 1 |
commit: eedb960b034d2af4d7a735fe623b851bc3ba2f6b |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 30 05:54:23 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 30 05:55:27 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eedb960b |
| 7 |
|
| 8 |
dev-lang/tcl: Version 8.6.8. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
| 11 |
|
| 12 |
dev-lang/tcl/Manifest | 1 + |
| 13 |
dev-lang/tcl/files/tcl-8.6.8-conf.patch | 11 +++ |
| 14 |
dev-lang/tcl/files/tcl-8.6.8-libieee.patch | 15 ++++ |
| 15 |
dev-lang/tcl/tcl-8.6.8.ebuild | 130 +++++++++++++++++++++++++++++ |
| 16 |
4 files changed, 157 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest |
| 19 |
index a424064816d..d0809e4c587 100644 |
| 20 |
--- a/dev-lang/tcl/Manifest |
| 21 |
+++ b/dev-lang/tcl/Manifest |
| 22 |
@@ -1,4 +1,5 @@ |
| 23 |
DIST tcl-core8.6.5-src.tar.gz 5846556 BLAKE2B 9c3c48acffc13be526b507fc19711b21e710a84642d37d494bb46a2d4ac9445a95749fd9556ffbda57d55f90bd566d0c9cd72a800a34f062616aacf57e811aa4 SHA512 b726f7d3193ad92ba64911b8c724d5454c5a93d5f5e95462ec0a6d8ccbbdf20093888f66c83956d7631392ca805c1a80430f102c0a932de3ed55311101e0e09f |
| 24 |
DIST tcl-core8.6.6-src.tar.gz 5868427 BLAKE2B 3444d474bfdc4958919dbf75527420614251e3cffb0d18fbbf547ffb83ead544f266b6ea868738ae40e02075cf31be6e753e0f89da02a2a81ededf09fc9dd2e6 SHA512 469a0221ed16569b70986cdde261d0c0df3bf64c493b8d6fc8368eb14597f7c2f6a01f082a1c8f27eb720618956e053cc97fbb9aaf7bb29cc96781cdc8e9518c |
| 25 |
DIST tcl-core8.6.7-src.tar.gz 5875027 BLAKE2B bc08e4e6639ba33176c8c1e670b957b8ad62a4790ace4ff8f8dc964f676ca87473c31c28f645d32a8287f844756fa224a077f96f1425f61b9872a4a0ae1429a1 SHA512 95c8c5bcb4fe604a77ca6ba9d49f9e90d156feaa9f3ab97661983f256ab54476b103ec8de01cd47231ed95e6df5e36d60514aed2ba5b8f3619cc5a3698ad3ee5 |
| 26 |
+DIST tcl-core8.6.8-src.tar.gz 5887483 BLAKE2B 2b8428652e451b817fe63a811f910001929cdcbc8a8361cdf4f7df8e13cbf9b18c94a91c22c0f09cc46dc0174a66c44774b485539a8f24c14faee6658547b6b8 SHA512 36e6079b582c205e8c89435b361ef96550541357f473aea2ca4e6f01bd84e50ebd1474a75a1ae90640b9a5b392fb01ddfa71f0fa28e409b3569d88c32b4ddb69 |
| 27 |
DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568 |
| 28 |
|
| 29 |
diff --git a/dev-lang/tcl/files/tcl-8.6.8-conf.patch b/dev-lang/tcl/files/tcl-8.6.8-conf.patch |
| 30 |
new file mode 100644 |
| 31 |
index 00000000000..26599e1672f |
| 32 |
--- /dev/null |
| 33 |
+++ b/dev-lang/tcl/files/tcl-8.6.8-conf.patch |
| 34 |
@@ -0,0 +1,11 @@ |
| 35 |
+--- a/unix/tcl.m4 |
| 36 |
++++ b/unix/tcl.m4 |
| 37 |
+@@ -1402,7 +1402,7 @@ |
| 38 |
+ # get rid of the warnings. |
| 39 |
+ #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES" |
| 40 |
+ |
| 41 |
+- SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared' |
| 42 |
++ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -fPIC -Wl,-soname,${@}' |
| 43 |
+ DL_OBJS="tclLoadDl.o" |
| 44 |
+ DL_LIBS="-ldl" |
| 45 |
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic" |
| 46 |
|
| 47 |
diff --git a/dev-lang/tcl/files/tcl-8.6.8-libieee.patch b/dev-lang/tcl/files/tcl-8.6.8-libieee.patch |
| 48 |
new file mode 100644 |
| 49 |
index 00000000000..942144e68c7 |
| 50 |
--- /dev/null |
| 51 |
+++ b/dev-lang/tcl/files/tcl-8.6.8-libieee.patch |
| 52 |
@@ -0,0 +1,15 @@ |
| 53 |
+--- a/unix/tcl.m4 |
| 54 |
++++ b/unix/tcl.m4 |
| 55 |
+@@ -2470,12 +2470,9 @@ |
| 56 |
+ #-------------------------------------------------------------------- |
| 57 |
+ # On a few very rare systems, all of the libm.a stuff is |
| 58 |
+ # already in libc.a. Set compiler flags accordingly. |
| 59 |
+- # Also, Linux requires the "ieee" library for math to work |
| 60 |
+- # right (and it must appear before "-lm"). |
| 61 |
+ #-------------------------------------------------------------------- |
| 62 |
+ |
| 63 |
+ AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm") |
| 64 |
+- AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"]) |
| 65 |
+ |
| 66 |
+ #-------------------------------------------------------------------- |
| 67 |
+ # Interactive UNIX requires -linet instead of -lsocket, plus it |
| 68 |
|
| 69 |
diff --git a/dev-lang/tcl/tcl-8.6.8.ebuild b/dev-lang/tcl/tcl-8.6.8.ebuild |
| 70 |
new file mode 100644 |
| 71 |
index 00000000000..1ce4659ee38 |
| 72 |
--- /dev/null |
| 73 |
+++ b/dev-lang/tcl/tcl-8.6.8.ebuild |
| 74 |
@@ -0,0 +1,130 @@ |
| 75 |
+# Copyright 1999-2018 Gentoo Foundation |
| 76 |
+# Distributed under the terms of the GNU General Public License v2 |
| 77 |
+ |
| 78 |
+EAPI=6 |
| 79 |
+ |
| 80 |
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator |
| 81 |
+ |
| 82 |
+MY_P="${PN}${PV}" |
| 83 |
+ |
| 84 |
+DESCRIPTION="Tool Command Language" |
| 85 |
+HOMEPAGE="http://www.tcl.tk/" |
| 86 |
+SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz" |
| 87 |
+ |
| 88 |
+LICENSE="tcltk" |
| 89 |
+SLOT="0/8.6" |
| 90 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 91 |
+IUSE="debug +threads" |
| 92 |
+ |
| 93 |
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" |
| 94 |
+DEPEND="${RDEPEND}" |
| 95 |
+ |
| 96 |
+SPARENT="${WORKDIR}/${MY_P}" |
| 97 |
+S="${SPARENT}"/unix |
| 98 |
+ |
| 99 |
+PATCHES=( |
| 100 |
+ "${FILESDIR}"/${PN}-8.5.13-multilib.patch |
| 101 |
+ "${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971 |
| 102 |
+ "${FILESDIR}"/${PN}-8.6.8-libieee.patch |
| 103 |
+) |
| 104 |
+ |
| 105 |
+src_prepare() { |
| 106 |
+ find \ |
| 107 |
+ "${SPARENT}"/compat/* \ |
| 108 |
+ "${SPARENT}"/doc/try.n \ |
| 109 |
+ -delete || die |
| 110 |
+ |
| 111 |
+ pushd "${SPARENT}" &>/dev/null || die |
| 112 |
+ default |
| 113 |
+ popd &>/dev/null || die |
| 114 |
+ |
| 115 |
+ # workaround stack check issues, bug #280934 |
| 116 |
+ use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1" |
| 117 |
+ |
| 118 |
+ tc-export CC |
| 119 |
+ |
| 120 |
+ sed \ |
| 121 |
+ -e '/chmod/s:555:755:g' \ |
| 122 |
+ -i Makefile.in || die |
| 123 |
+ |
| 124 |
+ sed \ |
| 125 |
+ -e 's:-O[2s]\?::g' \ |
| 126 |
+ -i tcl.m4 || die |
| 127 |
+ |
| 128 |
+ mv configure.{in,ac} || die |
| 129 |
+ |
| 130 |
+ eautoconf |
| 131 |
+ |
| 132 |
+ multilib_copy_sources |
| 133 |
+} |
| 134 |
+ |
| 135 |
+multilib_src_configure() { |
| 136 |
+ # We went ahead and deleted the whole compat/ subdir which means |
| 137 |
+ # the configure tests to detect broken versions need to pass (else |
| 138 |
+ # we'll fail to build). This comes up when cross-compiling, but |
| 139 |
+ # might as well get a minor configure speed up normally. |
| 140 |
+ export ac_cv_func_memcmp_working="yes" |
| 141 |
+ export tcl_cv_str{str,toul,tod}_unbroken="ok" |
| 142 |
+ export tcl_cv_strtod_buggy="no" |
| 143 |
+ |
| 144 |
+ econf \ |
| 145 |
+ $(use_enable threads) \ |
| 146 |
+ $(use_enable debug symbols) |
| 147 |
+} |
| 148 |
+ |
| 149 |
+multilib_src_install() { |
| 150 |
+ #short version number |
| 151 |
+ local v1=$(get_version_component_range 1-2) |
| 152 |
+ local mylibdir=$(get_libdir) |
| 153 |
+ |
| 154 |
+ S= default |
| 155 |
+ # fix the tclConfig.sh to eliminate refs to the build directory |
| 156 |
+ # and drop unnecessary -L inclusion to default system libdir |
| 157 |
+ |
| 158 |
+ sed \ |
| 159 |
+ -e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \ |
| 160 |
+ -e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
| 161 |
+ -e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \ |
| 162 |
+ -e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \ |
| 163 |
+ -e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \ |
| 164 |
+ -e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \ |
| 165 |
+ -e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \ |
| 166 |
+ -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die |
| 167 |
+ if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then |
| 168 |
+ sed \ |
| 169 |
+ -e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \ |
| 170 |
+ -e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \ |
| 171 |
+ -i "${ED}"/usr/${mylibdir}/tclConfig.sh || die |
| 172 |
+ fi |
| 173 |
+ |
| 174 |
+ # install private headers |
| 175 |
+ insinto /usr/${mylibdir}/tcl${v1}/include/unix |
| 176 |
+ doins *.h |
| 177 |
+ insinto /usr/${mylibdir}/tcl${v1}/include/generic |
| 178 |
+ doins "${SPARENT}"/generic/*.h |
| 179 |
+ rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die |
| 180 |
+ |
| 181 |
+ # install symlink for libraries |
| 182 |
+ dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname) |
| 183 |
+ dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a |
| 184 |
+ |
| 185 |
+ if multilib_is_native_abi; then |
| 186 |
+ dosym tclsh${v1} /usr/bin/tclsh |
| 187 |
+ dodoc "${SPARENT}"/{ChangeLog*,README,changes} |
| 188 |
+ fi |
| 189 |
+} |
| 190 |
+ |
| 191 |
+pkg_postinst() { |
| 192 |
+ for version in ${REPLACING_VERSIONS}; do |
| 193 |
+ if ! version_is_at_least 8.6 ${version}; then |
| 194 |
+ echo |
| 195 |
+ ewarn "You're upgrading from <${P}, you must recompile the other" |
| 196 |
+ ewarn "packages on your system that link with tcl after the upgrade" |
| 197 |
+ ewarn "completes. To perform this action, please run revdep-rebuild" |
| 198 |
+ ewarn "in package app-portage/gentoolkit." |
| 199 |
+ ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should" |
| 200 |
+ ewarn "upgrade them before this recompilation, too," |
| 201 |
+ echo |
| 202 |
+ fi |
| 203 |
+ done |
| 204 |
+} |
Archives