aboutsummaryrefslogtreecommitdiff
path: root/package/tcl/tcl.mk
diff options
context:
space:
mode:
authorGravatar Andrew Ruder <andrew.ruder@elecsyscorp.com>2014-04-08 15:54:04 -0500
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-04-09 00:57:19 +0200
commit7fda943b435d0ad64125d004aae82c6ee4d821da (patch)
tree68af75fdbae6e7f14ae8573fd8df27da94d8a2b1 /package/tcl/tcl.mk
parent28f0d896aed92980fcfcc3d6033772607c790a58 (diff)
downloadbuildroot-7fda943b435d0ad64125d004aae82c6ee4d821da.tar.gz
buildroot-7fda943b435d0ad64125d004aae82c6ee4d821da.tar.bz2
tcl: bump to version 8.6.1
Turn off building compatibility layers for old/broken versions of standard functions (strstr, strtoul, strtod) with the assumption that anything buildroot is using as a standard C library will be good enough to not have broken behavior. Signed-off-by: Andrew Ruder <andrew.ruder@elecsyscorp.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/tcl/tcl.mk')
-rw-r--r--package/tcl/tcl.mk50
1 files changed, 43 insertions, 7 deletions
diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk
index 4647f036cf..efb2ec8814 100644
--- a/package/tcl/tcl.mk
+++ b/package/tcl/tcl.mk
@@ -4,24 +4,52 @@
#
################################################################################
-TCL_VERSION_MAJOR = 8.4
-TCL_VERSION = $(TCL_VERSION_MAJOR).19
+TCL_VERSION_MAJOR = 8.6
+TCL_VERSION = $(TCL_VERSION_MAJOR).1
TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION)
TCL_LICENSE = tcl license
TCL_LICENSE_FILES = license.terms
TCL_SUBDIR = unix
TCL_INSTALL_STAGING = YES
+TCL_AUTORECONF = YES
+
+# Note that --with-system-sqlite will only make a difference
+# in the sqlite package (which gets removed if sqlite not
+# configured). Don't need to worry about conditionally including
+# it in the configure options
TCL_CONF_OPT = \
--disable-symbols \
--disable-langinfo \
- --disable-framework
+ --disable-framework \
+ --with-system-sqlite
HOST_TCL_CONF_OPT = \
--disable-symbols \
--disable-langinfo \
--disable-framework
+# I haven't found a good way to force pkgs to not build
+# or configure without just removing the entire pkg directory.
+define HOST_TCL_REMOVE_PACKAGES
+ rm -fr $(@D)/pkgs/sqlite3.8.0 \
+ $(@D)/pkgs/tdbc1.0.0 \
+ $(@D)/pkgs/tdbcmysql1.0.0 \
+ $(@D)/pkgs/tdbcodbc1.0.0 \
+ $(@D)/pkgs/tdbcpostgres1.0.0 \
+ $(@D)/pkgs/tdbcsqlite3-1.0.0
+endef
+HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES
+define TCL_REMOVE_PACKAGES
+ rm -fr $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/sqlite3.8.0) \
+ $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbc1.0.0) \
+ $(@D)/pkgs/tdbcmysql1.0.0 \
+ $(@D)/pkgs/tdbcodbc1.0.0 \
+ $(@D)/pkgs/tdbcpostgres1.0.0 \
+ $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3-1.0.0)
+endef
+TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES
+
ifeq ($(BR2_PACKAGE_TCL_DEL_ENCODINGS),y)
define TCL_REMOVE_ENCODINGS
rm -rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/*
@@ -41,12 +69,20 @@ endef
TCL_POST_INSTALL_TARGET_HOOKS += TCL_SYMLINK_TCLSH
endif
-# library get installed read only, so strip fails
-define TCL_FIXUP_RO_LIB
- chmod +w $(TARGET_DIR)/usr/lib/libtcl*
+# Until someone needs it, we don't handle locale installation. tcl has
+# a complicated method of translating LANG-style locale names into its internal
+# .msg name which makes it difficult to save the correct locales per the
+# configured whitelist.
+define TCL_REMOVE_EXTRA
+ rm -fr $(TARGET_DIR)/usr/lib/tclConfig.sh \
+ $(TARGET_DIR)/usr/lib/tclooConfig.sh \
+ $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/tclAppInit.c \
+ $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/msgs
endef
+TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA
-TCL_POST_INSTALL_TARGET_HOOKS += TCL_FIXUP_RO_LIB
+TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite)
+HOST_TCL_DEPENDENCIES =
$(eval $(autotools-package))
$(eval $(host-autotools-package))