Tcl Source Code

Check-in [4b11db28e6]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix [5916e48806]: tcl.pc: hardcoded depedencies, missing build flags
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | core-8-branch
Files: files | file ages | folders
SHA3-256: 4b11db28e63dbe4ab6c92d3feed037051a1720dd69eeb75f782b9a6cc2182100
User & Date: jan.nijtmans 2023-07-11 09:20:52.807
References
2023-07-11
09:30 Closed ticket [5916e48806]: tcl.pc: hardcoded depedencies, missing build flags plus 7 other changes artifact: 562cf1b749 user: jan.nijtmans
Context
2023-07-12
06:39
Fix [54329e39c7] check-in: 95cab70fe8 user: apnadkarni tags: core-8-branch
2023-07-11
09:23
Merge 8.7 check-in: 71ba59091e user: jan.nijtmans tags: trunk, main
09:20
Fix [5916e48806]: tcl.pc: hardcoded depedencies, missing build flags check-in: 4b11db28e6 user: jan.nijtmans tags: core-8-branch
2023-07-10
15:57
Code cleanup for arithSeries, all backported from 9.0 check-in: f93176d784 user: jan.nijtmans tags: core-8-branch
Changes
Unified Diff Ignore Whitespace Patch
Changes to unix/configure.
733
734
735
736
737
738
739


740
741
742
743
744
745
746
TCL_LIBS
LIBOBJS
AR
RANLIB
TOMMATH_INCLUDE
TOMMATH_SRCS
TOMMATH_OBJS


ZLIB_INCLUDE
ZLIB_SRCS
ZLIB_OBJS
TCLSH_PROG
SHARED_BUILD
EGREP
GREP







>
>







733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
TCL_LIBS
LIBOBJS
AR
RANLIB
TOMMATH_INCLUDE
TOMMATH_SRCS
TOMMATH_OBJS
TCL_PC_CFLAGS
TCL_PC_REQUIRES_PRIVATE
ZLIB_INCLUDE
ZLIB_SRCS
ZLIB_OBJS
TCLSH_PROG
SHARED_BUILD
EGREP
GREP
5134
5135
5136
5137
5138
5139
5140




5141
5142
5143
5144
5145
5146
5147
    libtommath_ok=no
fi

fi
fi
if test $libtommath_ok = yes
then :






printf "%s\n" "#define TCL_WITH_EXTERNAL_TOMMATH 1" >>confdefs.h


else $as_nop








>
>
>
>







5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
    libtommath_ok=no
fi

fi
fi
if test $libtommath_ok = yes
then :

  TCL_PC_REQUIRES_PRIVATE='libtommath >= 1.2.0,'

  TCL_PC_CFLAGS='-DTCL_WITH_EXTERNAL_TOMMATH'


printf "%s\n" "#define TCL_WITH_EXTERNAL_TOMMATH 1" >>confdefs.h


else $as_nop

Changes to unix/configure.ac.
181
182
183
184
185
186
187


188
189
190
191
192
193
194
	AC_CHECK_TYPE([mp_int],[],[libtommath_ok=no],[#include <tommath.h>])],[
	libtommath_ok=no])
    AS_IF([test $libtommath_ok = yes], [
	AC_CHECK_LIB([tommath],[mp_log_u32],[MATH_LIBS="$MATH_LIBS -ltommath"],[
    libtommath_ok=no])])
fi
AS_IF([test $libtommath_ok = yes], [


  AC_DEFINE(TCL_WITH_EXTERNAL_TOMMATH, 1, [Tcl with external libtommath])
], [
  AC_SUBST(TOMMATH_OBJS,[\${TOMMATH_OBJS}])
  AC_SUBST(TOMMATH_SRCS,[\${TOMMATH_SRCS}])
  AC_SUBST(TOMMATH_INCLUDE,[-I\${TOMMATH_DIR}])
])








>
>







181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
	AC_CHECK_TYPE([mp_int],[],[libtommath_ok=no],[#include <tommath.h>])],[
	libtommath_ok=no])
    AS_IF([test $libtommath_ok = yes], [
	AC_CHECK_LIB([tommath],[mp_log_u32],[MATH_LIBS="$MATH_LIBS -ltommath"],[
    libtommath_ok=no])])
fi
AS_IF([test $libtommath_ok = yes], [
  AC_SUBST(TCL_PC_REQUIRES_PRIVATE, ['libtommath >= 1.2.0,'])
  AC_SUBST(TCL_PC_CFLAGS, ['-DTCL_WITH_EXTERNAL_TOMMATH'])
  AC_DEFINE(TCL_WITH_EXTERNAL_TOMMATH, 1, [Tcl with external libtommath])
], [
  AC_SUBST(TOMMATH_OBJS,[\${TOMMATH_OBJS}])
  AC_SUBST(TOMMATH_SRCS,[\${TOMMATH_SRCS}])
  AC_SUBST(TOMMATH_INCLUDE,[-I\${TOMMATH_DIR}])
])

Changes to unix/tcl.pc.in.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
# tcl pkg-config source file

prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
libfile=@TCL_LIB_FILE@

Name: Tool Command Language
Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses.
URL: https://www.tcl-lang.org/
Version: @TCL_VERSION@@TCL_PATCH_LEVEL@
Requires.private: zlib >= 1.2.3, libtommath >= 1.2.0
Libs: -L${libdir} @TCL_LIB_FLAG@ @TCL_STUB_LIB_FLAG@
Libs.private: @TCL_LIBS@
Cflags: -I${includedir}












|


|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
# tcl pkg-config source file

prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
libfile=@TCL_LIB_FILE@

Name: Tool Command Language
Description: Tcl is a powerful, easy-to-learn dynamic programming language, suitable for a wide range of uses.
URL: https://www.tcl-lang.org/
Version: @TCL_VERSION@@TCL_PATCH_LEVEL@
Requires.private: @TCL_PC_REQUIRES_PRIVATE@ zlib >= 1.2.3
Libs: -L${libdir} @TCL_LIB_FLAG@ @TCL_STUB_LIB_FLAG@
Libs.private: @TCL_LIBS@
Cflags: -I${includedir} @TCL_PC_CFLAGS@