[ngspice] Fix FTBFS with tcl-8.6 (#1106295)

Yaakov Selkowitz yselkowitz at fedoraproject.org
Tue Jul 8 02:50:41 UTC 2014


commit acfd5d503a58a555734e8b27a9c0258b0fe4f950
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Fri Jun 13 14:25:02 2014 -0500

    Fix FTBFS with tcl-8.6 (#1106295)

 ngspice.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/ngspice.spec b/ngspice.spec
index 3f84494..0a059c4 100644
--- a/ngspice.spec
+++ b/ngspice.spec
@@ -20,7 +20,7 @@ Version:           23
 %if %{?devel}
 %define snap      .20111129cvs       
 %endif
-Release:           7%{?snap}%{?dist}
+Release:           8%{?snap}%{?dist}
 Summary:           A mixed level/signal circuit simulator
 
 License:           BSD
@@ -158,6 +158,10 @@ sed -i "s|\#define NGSPICEDATADIR \"\`echo \$dprefix/share/ngspice\`\"|\#define
 sed -i  's|../ng-spice-manuals|../../ng-spice-manuals|g' manual/Makefile.am
 %endif
 
+# direct access to Tcl_Interp->result deprecated in tcl8.6,
+# remaining usage cannot be replaced by Tcl_SetResult
+export CPPFLAGS=-DUSE_INTERP_RESULT
+
 %configure \
     --disable-xgraph \
     --enable-adms \
@@ -176,11 +180,7 @@ sed -i  's|../ng-spice-manuals|../../ng-spice-manuals|g' manual/Makefile.am
     --enable-shared \
     --enable-ndev \
     --with-readline=yes \
-%if 0%{?fedora}
-    --with-tcl=%{_libdir}/tcl8.5/ \
-   %else
     --with-tcl=%{_libdir}/ \
-%endif
     --libdir=%{_libdir}/tclspice
 
 %{__make}
@@ -278,6 +278,9 @@ cd tests
 
 
 %changelog
+* Fri Jun 13 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 23-8
+- Fix FTBFS with tcl-8.6 (#1106295)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 23-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list