Skip to content

Commit

Permalink
Update tcl to v8.6.11 (#4577)
Browse files Browse the repository at this point in the history
* update tcl to 8.6.11
- include 64-bit support for amd64 and arm64
* avoid SPK_LINKS for tcl package
- create link at build time
- replace SPK_LINKS by SPK_COMMANDS to get DSM7 compatibility
  • Loading branch information
hgy59 authored May 2, 2021
1 parent 311d2fd commit 91fa9f2
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 39 deletions.
8 changes: 4 additions & 4 deletions cross/tcl/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = tcl
PKG_VERS = 8.6.10
PKG_VERS = 8.6.11
PKG_MAIN_VERS=$(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)$(PKG_VERS)-src.$(PKG_EXT)
Expand All @@ -16,9 +16,8 @@ GNU_CONFIGURE = 1

include ../../mk/spksrc.archs.mk

# Enable 64-bit support in Tcl for x64 architectures
# aarch64 does not support 64-bit (don't know magic for this platform)
ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
# Enable 64-bit support in Tcl for 64-bit architectures (amd64 and arm64)
ifeq ($(findstring $(ARCH),$(x64_ARCHS) $(ARMv8_ARCHS)),$(ARCH))
CONFIGURE_ARGS = --enable-64bit
endif

Expand All @@ -31,3 +30,4 @@ include ../../mk/spksrc.cross-cc.mk
.PHONY: tcl_post_install
tcl_post_install:
$(RUN) ln -s -r $(STAGING_INSTALL_PREFIX)/lib/libtcl$(PKG_MAIN_VERS).so $(STAGING_INSTALL_PREFIX)/lib/libtcl.so
$(RUN) ln -s -r $(STAGING_INSTALL_PREFIX)/bin/tclsh$(PKG_MAIN_VERS) $(STAGING_INSTALL_PREFIX)/bin/tclsh
57 changes: 29 additions & 28 deletions cross/tcl/PLIST
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
rsc:bin/sqlite3_analyzer
lnk:bin/tclsh
bin:bin/tclsh8.6
rsc:lib/itcl4.2.0/itcl.tcl
rsc:lib/itcl4.2.0/itclConfig.sh
rsc:lib/itcl4.2.0/itclHullCmds.tcl
rsc:lib/itcl4.2.0/itclWidget.tcl
lib:lib/itcl4.2.0/libitcl4.2.0.so
rsc:lib/itcl4.2.0/pkgIndex.tcl
rsc:lib/itcl4.2.1/itcl.tcl
rsc:lib/itcl4.2.1/itclConfig.sh
rsc:lib/itcl4.2.1/itclHullCmds.tcl
rsc:lib/itcl4.2.1/itclWidget.tcl
lib:lib/itcl4.2.1/libitcl4.2.1.so
rsc:lib/itcl4.2.1/pkgIndex.tcl
lnk:lib/libtcl.so
lib:lib/libtcl8.6.so
lib:lib/sqlite3.30.1.2/libsqlite3.30.1.2.so
rsc:lib/sqlite3.30.1.2/pkgIndex.tcl
lib:lib/sqlite3.34.0/libsqlite3.34.0.so
rsc:lib/sqlite3.34.0/pkgIndex.tcl
rsc:lib/tcl8.6/auto.tcl
rsc:lib/tcl8.6/clock.tcl
rsc:lib/tcl8.6/encoding/
Expand All @@ -26,27 +27,27 @@ rsc:lib/tcl8.6/safe.tcl
rsc:lib/tcl8.6/tclIndex
rsc:lib/tcl8.6/tm.tcl
rsc:lib/tcl8.6/word.tcl
rsc:lib/tcl8/8.4/platform-1.0.14.tm
rsc:lib/tcl8/8.4/platform-1.0.15.tm
rsc:lib/tcl8/8.4/platform/shell-1.1.4.tm
rsc:lib/tcl8/8.5/msgcat-1.6.1.tm
rsc:lib/tcl8/8.5/tcltest-2.5.1.tm
rsc:lib/tcl8/8.6/http-2.9.1.tm
rsc:lib/tcl8/8.6/tdbc/sqlite3-1.1.1.tm
rsc:lib/tcl8/8.5/tcltest-2.5.3.tm
rsc:lib/tcl8/8.6/http-2.9.5.tm
rsc:lib/tcl8/8.6/tdbc/sqlite3-1.1.2.tm
rsc:lib/tclConfig.sh
rsc:lib/tclooConfig.sh
lib:lib/tdbc1.1.1/libtdbc1.1.1.so
rsc:lib/tdbc1.1.1/pkgIndex.tcl
rsc:lib/tdbc1.1.1/tdbc.tcl
rsc:lib/tdbc1.1.1/tdbcConfig.sh
lib:lib/tdbcmysql1.1.1/libtdbcmysql1.1.1.so
rsc:lib/tdbcmysql1.1.1/pkgIndex.tcl
rsc:lib/tdbcmysql1.1.1/tdbcmysql.tcl
lib:lib/tdbcodbc1.1.1/libtdbcodbc1.1.1.so
rsc:lib/tdbcodbc1.1.1/pkgIndex.tcl
rsc:lib/tdbcodbc1.1.1/tdbcodbc.tcl
lib:lib/tdbcpostgres1.1.1/libtdbcpostgres1.1.1.so
rsc:lib/tdbcpostgres1.1.1/pkgIndex.tcl
rsc:lib/tdbcpostgres1.1.1/tdbcpostgres.tcl
lib:lib/thread2.8.5/libthread2.8.5.so
rsc:lib/thread2.8.5/pkgIndex.tcl
rsc:lib/thread2.8.5/ttrace.tcl
lib:lib/tdbc1.1.2/libtdbc1.1.2.so
rsc:lib/tdbc1.1.2/pkgIndex.tcl
rsc:lib/tdbc1.1.2/tdbc.tcl
rsc:lib/tdbc1.1.2/tdbcConfig.sh
lib:lib/tdbcmysql1.1.2/libtdbcmysql1.1.2.so
rsc:lib/tdbcmysql1.1.2/pkgIndex.tcl
rsc:lib/tdbcmysql1.1.2/tdbcmysql.tcl
lib:lib/tdbcodbc1.1.2/libtdbcodbc1.1.2.so
rsc:lib/tdbcodbc1.1.2/pkgIndex.tcl
rsc:lib/tdbcodbc1.1.2/tdbcodbc.tcl
lib:lib/tdbcpostgres1.1.2/libtdbcpostgres1.1.2.so
rsc:lib/tdbcpostgres1.1.2/pkgIndex.tcl
rsc:lib/tdbcpostgres1.1.2/tdbcpostgres.tcl
lib:lib/thread2.8.6/libthread2.8.6.so
rsc:lib/thread2.8.6/pkgIndex.tcl
rsc:lib/thread2.8.6/ttrace.tcl
6 changes: 3 additions & 3 deletions cross/tcl/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tcl8.6.10-src.tar.gz SHA1 0ba1dcc40db79749c322258781879a3c17093295
tcl8.6.10-src.tar.gz SHA256 5196dbf6638e3df8d5c87b5815c8c2b758496eb6f0e41446596c9a4e638d87ed
tcl8.6.10-src.tar.gz MD5 97c55573f8520bcab74e21bfd8d0aadc
tcl8.6.11-src.tar.gz SHA1 8e2ccdafdcaee0274de16a6dfd627b490ecfa196
tcl8.6.11-src.tar.gz SHA256 8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258
tcl8.6.11-src.tar.gz MD5 8a4c004f48984a03a7747e9ba06e4da4
8 changes: 4 additions & 4 deletions spk/tcl/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
SPK_NAME = tcl
SPK_VERS = 8.6.10
SPK_VERS = 8.6.11
SPK_MAIN_VERS=$(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
SPK_REV = 5
SPK_REV = 6
SPK_ICON = src/tcl.png

DEPENDS = cross/$(SPK_NAME)
Expand All @@ -16,11 +16,11 @@ DESCRIPTION = "Tcl \(Tool Command Language\) is a very powerful but easy to lear
RELOAD_UI = no
DISPLAY_NAME = Tcl
STARTABLE = no
CHANGELOG = "1. 64-bit support for x64 archs added.<br/>2. zlib compression fixed."
CHANGELOG = "1. Update tcl to 8.6.11 released 2021-04-02.<br/>2. Add 64-bit support for all 64-bit archs."

HOMEPAGE = https://www.tcl.tk
LICENSE = Tcl/Tk License

SPK_LINKS = /usr/local/bin/tclsh:bin/tclsh$(SPK_MAIN_VERS)
SPK_COMMANDS = bin/tclsh bin/tclsh$(SPK_MAIN_VERS)

include ../../mk/spksrc.spk.mk

0 comments on commit 91fa9f2

Please # to comment.