[Pkg-tcltk-commits] r1958 - in tcl8.6/trunk/debian: . patches

Thu Feb 22 08:44:04 UTC 2018

Author: sgolovan
Date: 2018-02-22 08:44:03 +0000 (Thu, 22 Feb 2018)
New Revision: 1958

Added:
   tcl8.6/trunk/debian/patches/libeee.diff
Modified:
   tcl8.6/trunk/debian/changelog
   tcl8.6/trunk/debian/libtcl8.6.symbols
   tcl8.6/trunk/debian/patches/confsearch.diff
   tcl8.6/trunk/debian/patches/series
   tcl8.6/trunk/debian/patches/tclpackagepath.diff
Log:
[tcl8.6]
  * Add a patch by Aurelien Jarno, which disables linking to libieee because
    it'll be removed from glibc starting from version 2.27 (closes: #890243).
  * Fix spelling errors in a few patch descriptions.


Modified: tcl8.6/trunk/debian/changelog
===================================================================

--- tcl8.6/trunk/debian/changelog	2018-02-20 18:55:45 UTC (rev 1957)
+++ tcl8.6/trunk/debian/changelog	2018-02-22 08:44:03 UTC (rev 1958)
@@ -1,8 +1,10 @@
-tcl8.6 (8.6.8+dfsg-3) UNRELEASED; urgency=medium
+tcl8.6 (8.6.8+dfsg-3) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Add a patch by Aurelien Jarno, which disables linking to libieee because
+    it'll be removed from glibc starting from version 2.27 (closes: #890243).
+  * Fix spelling errors in a few patch descriptions.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 04 Jan 2018 15:24:22 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 22 Feb 2018 11:31:12 +0300
 
 tcl8.6 (8.6.8+dfsg-2) unstable; urgency=medium
 

Modified: tcl8.6/trunk/debian/libtcl8.6.symbols
===================================================================
--- tcl8.6/trunk/debian/libtcl8.6.symbols	2018-02-20 18:55:45 UTC (rev 1957)
+++ tcl8.6/trunk/debian/libtcl8.6.symbols	2018-02-22 08:44:03 UTC (rev 1958)
@@ -875,6 +875,5 @@
  TclpSetInitialEncodings at Base 8.6.0
  TclpUnloadFile at Base 8.6.2
  TclpUtfNcmp2 at Base 8.6.0
- _LIB_VERSION at Base 8.6.0
 #MISSING: 8.6.7# notifierInitMutex at Base 8.6.5
 #MISSING: 8.6.7# notifierMutex at Base 8.6.5

Modified: tcl8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.6/trunk/debian/patches/confsearch.diff	2018-02-20 18:55:45 UTC (rev 1957)
+++ tcl8.6/trunk/debian/patches/confsearch.diff	2018-02-22 08:44:03 UTC (rev 1958)
@@ -1,4 +1,4 @@
-Patch by Sergei Golovan allows to find tclConfig.sh in /usr/lib/tcl8.6
+Patch by Sergei Golovan allows one to find tclConfig.sh in /usr/lib/tcl8.6
 and tkConfig.sh in /usr/lib/tk8.6 where they are located in Debian
 installation.
 

Added: tcl8.6/trunk/debian/patches/libeee.diff
===================================================================
--- tcl8.6/trunk/debian/patches/libeee.diff	                        (rev 0)
+++ tcl8.6/trunk/debian/patches/libeee.diff	2018-02-22 08:44:03 UTC (rev 1958)
@@ -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.
+
+--- tcl8.6-8.6.8+dfsg.orig/unix/configure
++++ tcl8.6-8.6.8+dfsg/unix/configure
+@@ -4280,8 +4280,6 @@ $as_echo "#define TCL_CFGVAL_ENCODING \"
+     #--------------------------------------------------------------------
+     # 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 @@ else
+   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
+--- tcl8.6-8.6.8+dfsg.orig/unix/tcl.m4
++++ tcl8.6-8.6.8+dfsg/unix/tcl.m4
+@@ -2475,12 +2475,9 @@ AC_DEFUN([SC_TCL_LINK_LIBS], [
+     #--------------------------------------------------------------------
+     # 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.6/trunk/debian/patches/series
===================================================================
--- tcl8.6/trunk/debian/patches/series	2018-02-20 18:55:45 UTC (rev 1957)
+++ tcl8.6/trunk/debian/patches/series	2018-02-22 08:44:03 UTC (rev 1958)
@@ -4,3 +4,4 @@
 confsearch.diff
 non-linux.diff
 manpages.diff
+libeee.diff

Modified: tcl8.6/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tclpackagepath.diff	2018-02-20 18:55:45 UTC (rev 1957)
+++ tcl8.6/trunk/debian/patches/tclpackagepath.diff	2018-02-22 08:44:03 UTC (rev 1958)
@@ -1,4 +1,4 @@
-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.
 


