Commit 16b17c9a authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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



Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 1541d648

package/sqlcipher/sqlcipher.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 \

package/tcl/tcl.mk

+5 −3
Original line number Diff line number Diff line
@@ -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