[Pkg-tcltk-commits] r1960 - in tcl8.7/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Thu Feb 22 09:26:22 UTC 2018
Author: sgolovan
Date: 2018-02-22 09:26:22 +0000 (Thu, 22 Feb 2018)
New Revision: 1960
Added:
tcl8.7/trunk/debian/patches/libeee.diff
Modified:
tcl8.7/trunk/debian/changelog
tcl8.7/trunk/debian/libtcl8.7.symbols
tcl8.7/trunk/debian/patches/confsearch.diff
tcl8.7/trunk/debian/patches/non-linux.diff
tcl8.7/trunk/debian/patches/series
tcl8.7/trunk/debian/patches/tcllibrary.diff
tcl8.7/trunk/debian/patches/tclpackagepath.diff
Log:
[tcl8.7]
* Adapt a patch by Aurelien Jarno, which disables linking to libieee because
it'll be removed from glibc starting from version 2.27.
* Fix spelling errors in a few patch descriptions.
Modified: tcl8.7/trunk/debian/changelog
===================================================================
--- tcl8.7/trunk/debian/changelog 2018-02-22 09:07:26 UTC (rev 1959)
+++ tcl8.7/trunk/debian/changelog 2018-02-22 09:26:22 UTC (rev 1960)
@@ -1,8 +1,10 @@
-tcl8.7 (8.7.0~a1+dfsg-3) UNRELEASED; urgency=medium
+tcl8.7 (8.7.0~a1+dfsg-3) experimental; urgency=medium
- * NOT RELEASED YET
+ * Adapt a patch by Aurelien Jarno, which disables linking to libieee because
+ it'll be removed from glibc starting from version 2.27.
+ * Fix spelling errors in a few patch descriptions.
- -- Sergei Golovan <sgolovan at debian.org> Sat, 27 Jan 2018 17:27:47 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 22 Feb 2018 12:10:18 +0300
tcl8.7 (8.7.0~a1+dfsg-2) experimental; urgency=medium
Modified: tcl8.7/trunk/debian/libtcl8.7.symbols
===================================================================
--- tcl8.7/trunk/debian/libtcl8.7.symbols 2018-02-22 09:07:26 UTC (rev 1959)
+++ tcl8.7/trunk/debian/libtcl8.7.symbols 2018-02-22 09:26:22 UTC (rev 1960)
@@ -877,5 +877,4 @@
TclpSetInitialEncodings at Base 8.7.0~a1
TclpUnloadFile at Base 8.7.0~a1
TclpUtfNcmp2 at Base 8.7.0~a1
- _LIB_VERSION at Base 8.7.0~a1
(arch=hurd-i386)pthread_atfork at Base 8.7.0~a1
Modified: tcl8.7/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.7/trunk/debian/patches/confsearch.diff 2018-02-22 09:07:26 UTC (rev 1959)
+++ tcl8.7/trunk/debian/patches/confsearch.diff 2018-02-22 09:26:22 UTC (rev 1960)
@@ -1,4 +1,4 @@
-Patch by Sergei Golovan allows to find tclConfig.sh in /usr/lib/tcl8.7
+Patch by Sergei Golovan allows one to find tclConfig.sh in /usr/lib/tcl8.7
and tkConfig.sh in /usr/lib/tk8.7 where they are located in Debian
installation.
Added: tcl8.7/trunk/debian/patches/libeee.diff
===================================================================
--- tcl8.7/trunk/debian/patches/libeee.diff (rev 0)
+++ tcl8.7/trunk/debian/patches/libeee.diff 2018-02-22 09:26:22 UTC (rev 1960)
@@ -0,0 +1,73 @@
+Support for the "ieee" library (part of SVID specification) has been
+removed from glibc 2.27 onwards. While this is correctly autodetected
+in the configure script, it's better to already disable support for it
+as 1) it ends up in tclConfig.sh and 2) it slightly changes the symbol
+file.
+
+--- a/unix/configure
++++ b/unix/configure
+@@ -4280,8 +4280,6 @@
+ #--------------------------------------------------------------------
+ # On a few very rare systems, all of the libm.a stuff is
+ # already in libc.a. Set compiler flags accordingly.
+- # Also, Linux requires the "ieee" library for math to work
+- # right (and it must appear before "-lm").
+ #--------------------------------------------------------------------
+
+ ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin"
+@@ -4291,40 +4289,6 @@
+ MATH_LIBS="-lm"
+ fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lieee" >&5
+-$as_echo_n "checking for main in -lieee... " >&6; }
+-if ${ac_cv_lib_ieee_main+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lieee $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-
+-int
+-main ()
+-{
+-return main ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_ieee_main=yes
+-else
+- ac_cv_lib_ieee_main=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ieee_main" >&5
+-$as_echo "$ac_cv_lib_ieee_main" >&6; }
+-if test "x$ac_cv_lib_ieee_main" = xyes; then :
+- MATH_LIBS="-lieee $MATH_LIBS"
+-fi
+-
+
+ #--------------------------------------------------------------------
+ # Interactive UNIX requires -linet instead of -lsocket, plus it
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -2378,12 +2378,9 @@
+ #--------------------------------------------------------------------
+ # On a few very rare systems, all of the libm.a stuff is
+ # already in libc.a. Set compiler flags accordingly.
+- # Also, Linux requires the "ieee" library for math to work
+- # right (and it must appear before "-lm").
+ #--------------------------------------------------------------------
+
+ AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm")
+- AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"])
+
+ #--------------------------------------------------------------------
+ # Interactive UNIX requires -linet instead of -lsocket, plus it
Modified: tcl8.7/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.7/trunk/debian/patches/non-linux.diff 2018-02-22 09:07:26 UTC (rev 1959)
+++ tcl8.7/trunk/debian/patches/non-linux.diff 2018-02-22 09:26:22 UTC (rev 1960)
@@ -3,7 +3,7 @@
--- a/unix/configure
+++ b/unix/configure
-@@ -4908,6 +4908,9 @@
+@@ -4902,6 +4902,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
@@ -25,7 +25,7 @@
SHLIB_SUFFIX = @SHLIB_SUFFIX@
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
-@@ -925,6 +925,9 @@
+@@ -917,6 +917,9 @@
if test "`uname -s`" = "AIX" ; then
tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
fi
Modified: tcl8.7/trunk/debian/patches/series
===================================================================
--- tcl8.7/trunk/debian/patches/series 2018-02-22 09:07:26 UTC (rev 1959)
+++ tcl8.7/trunk/debian/patches/series 2018-02-22 09:26:22 UTC (rev 1960)
@@ -4,3 +4,4 @@
confsearch.diff
non-linux.diff
manpages.diff
+libeee.diff
Modified: tcl8.7/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.7/trunk/debian/patches/tcllibrary.diff 2018-02-22 09:07:26 UTC (rev 1959)
+++ tcl8.7/trunk/debian/patches/tcllibrary.diff 2018-02-22 09:26:22 UTC (rev 1960)
@@ -1,6 +1,6 @@
--- a/unix/configure
+++ b/unix/configure
-@@ -10245,7 +10245,7 @@
+@@ -10210,7 +10210,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -11,7 +11,7 @@
--- a/unix/configure.ac
+++ b/unix/configure.ac
-@@ -793,7 +793,7 @@
+@@ -823,7 +823,7 @@
eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
Modified: tcl8.7/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.7/trunk/debian/patches/tclpackagepath.diff 2018-02-22 09:07:26 UTC (rev 1959)
+++ tcl8.7/trunk/debian/patches/tclpackagepath.diff 2018-02-22 09:26:22 UTC (rev 1960)
@@ -1,10 +1,10 @@
-Patch by Sergei Golovan allows to specify TCL_PACKAGE_PATH at configure stage
+Patch by Sergei Golovan allows one to specify TCL_PACKAGE_PATH at configure stage
without adding /usr/lib to it. It helps to put the policy compliant value to
::tcl_pkgPath variable and to TCL_PACKAGE_PATH variable in tclConfig.sh.
--- a/unix/configure
+++ b/unix/configure
-@@ -10374,9 +10374,9 @@
+@@ -10339,9 +10339,9 @@
test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
elif test "$prefix/lib" != "$libdir"; then
@@ -18,7 +18,7 @@
#--------------------------------------------------------------------
--- a/unix/configure.ac
+++ b/unix/configure.ac
-@@ -886,9 +886,9 @@
+@@ -916,9 +916,9 @@
test -z "$TCL_MODULE_PATH" && \
TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
elif test "$prefix/lib" != "$libdir"; then
More information about the Pkg-tcltk-commits
mailing list