[Pkg-tcltk-commits] r1959 - in tcl8.5/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Feb 22 09:07:26 UTC 2018


Author: sgolovan
Date: 2018-02-22 09:07:26 +0000 (Thu, 22 Feb 2018)
New Revision: 1959

Added:
   tcl8.5/trunk/debian/patches/libeee.diff
Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/libtcl8.5.symbols
   tcl8.5/trunk/debian/patches/confsearch.diff
   tcl8.5/trunk/debian/patches/series
   tcl8.5/trunk/debian/patches/tclpackagepath.diff
Log:
[tcl8.5]
  * 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.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2018-02-22 08:44:03 UTC (rev 1958)
+++ tcl8.5/trunk/debian/changelog	2018-02-22 09:07:26 UTC (rev 1959)
@@ -1,8 +1,10 @@
-tcl8.5 (8.5.19-4) UNRELEASED; urgency=medium
+tcl8.5 (8.5.19-4) unstable; 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>  Thu, 04 Jan 2018 15:48:57 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 22 Feb 2018 11:46:44 +0300
 
 tcl8.5 (8.5.19-3) unstable; urgency=medium
 

Modified: tcl8.5/trunk/debian/libtcl8.5.symbols
===================================================================
--- tcl8.5/trunk/debian/libtcl8.5.symbols	2018-02-22 08:44:03 UTC (rev 1958)
+++ tcl8.5/trunk/debian/libtcl8.5.symbols	2018-02-22 09:07:26 UTC (rev 1959)
@@ -813,7 +813,6 @@
  TclpRealloc at Base 8.5.0
  TclpSetInitialEncodings at Base 8.5.0
  TclpUtfNcmp2 at Base 8.5.0
- _LIB_VERSION at Base 8.5.0
  notifierInitMutex at Base 8.5.19
  notifierMutex at Base 8.5.19
  tclIntPlatStubsPtr at Base 8.5.0

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

Added: tcl8.5/trunk/debian/patches/libeee.diff
===================================================================
--- tcl8.5/trunk/debian/patches/libeee.diff	                        (rev 0)
+++ tcl8.5/trunk/debian/patches/libeee.diff	2018-02-22 09:07:26 UTC (rev 1959)
@@ -0,0 +1,101 @@
+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
+@@ -5339,8 +5339,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").
+     #--------------------------------------------------------------------
+ 
+     echo "$as_me:$LINENO: checking for sin" >&5
+@@ -5439,68 +5437,6 @@
+   MATH_LIBS="-lm"
+ fi
+ 
+-    echo "$as_me:$LINENO: checking for main in -lieee" >&5
+-echo $ECHO_N "checking for main in -lieee... $ECHO_C" >&6
+-if test "${ac_cv_lib_ieee_main+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lieee  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-
+-int
+-main ()
+-{
+-main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_ieee_main=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_ieee_main=no
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_ieee_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_ieee_main" >&6
+-if test $ac_cv_lib_ieee_main = yes; then
+-  MATH_LIBS="-lieee $MATH_LIBS"
+-fi
+-
+ 
+     #--------------------------------------------------------------------
+     # Interactive UNIX requires -linet instead of -lsocket, plus it
+--- a/unix/tcl.m4
++++ b/unix/tcl.m4
+@@ -2645,12 +2645,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.5/trunk/debian/patches/series
===================================================================
--- tcl8.5/trunk/debian/patches/series	2018-02-22 08:44:03 UTC (rev 1958)
+++ tcl8.5/trunk/debian/patches/series	2018-02-22 09:07:26 UTC (rev 1959)
@@ -5,3 +5,4 @@
 non-linux.diff
 manpages.diff
 finalize-notifier.diff
+libeee.diff

Modified: tcl8.5/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclpackagepath.diff	2018-02-22 08:44:03 UTC (rev 1958)
+++ tcl8.5/trunk/debian/patches/tclpackagepath.diff	2018-02-22 09:07:26 UTC (rev 1959)
@@ -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.
 




More information about the Pkg-tcltk-commits mailing list