tcl: add _VERSION_MAJOR / _VERSION_MINOR and use instead of hardcoded 8.4

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2012-01-24 14:59:26 +01:00
parent 1541d648aa
commit 16b17c9a15
2 changed files with 6 additions and 4 deletions

View File

@ -12,7 +12,7 @@ SQLCIPHER_INSTALL_STAGING = YES
SQLCIPHER_CONF_ENV = \
CFLAGS+=" $(SQLCIPHER_CFLAGS)" \
LDFLAGS+=" $(SQLCIPHER_LDFLAGS)" \
TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh8.4
TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)
SQLCIPHER_CONF_OPT = \
--enable-threadsafe \

View File

@ -3,7 +3,9 @@
# TCL8.4
#
#############################################################
TCL_VERSION = 8.4.19
TCL_VERSION_MAJOR = 8.4
TCL_VERSION_MINOR = 19
TCL_VERSION = $(TCL_VERSION_MAJOR).$(TCL_VERSION_MINOR)
TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
TCL_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/tcl
TCL_SUBDIR = unix
@ -20,10 +22,10 @@ HOST_TCL_CONF_OPT = \
define TCL_POST_INSTALL_CLEANUP
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libtcl8.4.so
-if [ "$(BR2_PACKAGE_TCL_DEL_ENCODINGS)" = "y" ]; then \
rm -Rf $(TARGET_DIR)/usr/lib/tcl8.4/encoding/*; \
rm -Rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/*; \
fi
-if [ "$(BR2_PACKAGE_TCL_SHLIB_ONLY)" = "y" ]; then \
rm -f $(TARGET_DIR)/usr/bin/tclsh8.4; \
rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR); \
fi
endef