lang/tcl: bring back package, update to 8.6.8, add host compile
Signed-off-by: Vadim Radovel <vadim@radovel.ru>
This commit is contained in:
Vadim Radovel
parent
b2990b1586
commit
7bf98d8af1
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (C) 2006-2015 OpenWrt.org
|
||||
# Copyright (C) 2006-2018 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
|
|
@ -8,29 +8,31 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=tcl
|
||||
PKG_VERSION:=8.6.4
|
||||
TCL_MAJOR_VERSION:=8.6
|
||||
PKG_VERSION:=${TCL_MAJOR_VERSION}.8
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION)-src.tar.gz
|
||||
PKG_SOURCE_URL:=@SF/$(PKG_NAME)
|
||||
PKG_HASH:=9e6ed94c981c1d0c5f5fefb8112d06c6bf4d050a7327e95e71d417c416519c8d
|
||||
|
||||
PKG_HASH:=c43cb0c1518ce42b00e7c8f6eaddd5195c53a98f94adc717234a65cbcfd3f96a
|
||||
PKG_LICENSE:=TCL
|
||||
PKG_LICENSE_FILES:=license.terms
|
||||
PKG_MAINTAINER:=Joe Mistachkin <joe@mistachkin.com>
|
||||
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION)
|
||||
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)$(PKG_VERSION)
|
||||
|
||||
PKG_FIXUP:=autoreconf
|
||||
PKG_INSTALL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/host-build.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/tcl
|
||||
SUBMENU:=Tcl
|
||||
SECTION:=lang
|
||||
CATEGORY:=Languages
|
||||
DEPENDS:=+libpthread @BROKEN
|
||||
DEPENDS:=+libpthread +zlib
|
||||
TITLE:=The Tcl language
|
||||
URL:=http://www.tcl.tk/
|
||||
endef
|
||||
|
|
@ -54,12 +56,23 @@ CONFIGURE_ARGS += \
|
|||
|
||||
MAKE_PATH := unix
|
||||
|
||||
define Build/Prepare
|
||||
$(call Build/Prepare/Default)
|
||||
rm -rf $(PKG_BUILD_DIR)/pkgs/*
|
||||
endef
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/include
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
|
||||
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtcl*.{a,so*} $(1)/usr/lib/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/tclConfig.sh $(1)/usr/lib/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/tclooConfig.sh $(1)/usr/lib/
|
||||
|
||||
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/tcl.pc \
|
||||
$(1)/usr/lib/pkgconfig
|
||||
endef
|
||||
|
||||
define Package/tcl/install
|
||||
|
|
@ -68,6 +81,27 @@ define Package/tcl/install
|
|||
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
|
||||
|
||||
$(CP) -a $(PKG_INSTALL_DIR)/usr/lib/tcl8 $(1)/usr/lib/
|
||||
$(CP) -a $(PKG_INSTALL_DIR)/usr/lib/tcl$(TCL_MAJOR_VERSION) $(1)/usr/lib/
|
||||
$(LN) tclsh$(TCL_MAJOR_VERSION) $(1)/usr/bin/tclsh
|
||||
endef
|
||||
|
||||
define Host/Configure
|
||||
$(call Host/Configure/Default,$(1),$(2),$(CONFIGURE_PATH)/$(3))
|
||||
endef
|
||||
|
||||
define Host/Compile
|
||||
+$(HOST_MAKE_VARS) \
|
||||
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/$(MAKE_PATH) \
|
||||
$(HOST_MAKE_FLAGS) \
|
||||
$(1)
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(call Host/Compile,install)
|
||||
(cd $(HOST_BUILD_PREFIX)/bin; test -f tclsh || ln -s tclsh$(TCL_MAJOR_VERSION) tclsh)
|
||||
endef
|
||||
|
||||
$(eval $(call HostBuild))
|
||||
$(eval $(call BuildPackage,tcl))
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
--- a/unix/Makefile.in
|
||||
+++ b/unix/Makefile.in
|
||||
@@ -817,15 +817,15 @@ install-tzdata: tclsh
|
||||
@echo "Installing time zone data"
|
||||
@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
|
||||
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
|
||||
- ./tclsh $(TOOL_DIR)/installData.tcl \
|
||||
- $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata
|
||||
+ #./tclsh $(TOOL_DIR)/installData.tcl \
|
||||
+ # $(TOP_DIR)/library/tzdata "$(SCRIPT_INSTALL_DIR)"/tzdata
|
||||
|
||||
install-msgs: tclsh
|
||||
@echo "Installing message catalogs"
|
||||
@@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
|
||||
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
|
||||
- ./tclsh $(TOOL_DIR)/installData.tcl \
|
||||
- $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
|
||||
+ #./tclsh $(TOOL_DIR)/installData.tcl \
|
||||
+ # $(TOP_DIR)/library/msgs "$(SCRIPT_INSTALL_DIR)"/msgs
|
||||
|
||||
install-doc: doc
|
||||
@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
--- a/generic/tclStrToD.c
|
||||
+++ b/generic/tclStrToD.c
|
||||
@@ -73,7 +73,7 @@ typedef unsigned int fpu_control_t __att
|
||||
* MIPS floating-point units need special settings in control registers
|
||||
* to use gradual underflow as we expect.
|
||||
*/
|
||||
-#if defined(__mips)
|
||||
+#if defined(__sgi) && defined(_COMPILER_VERSION)
|
||||
#include <sys/fpu.h>
|
||||
#endif
|
||||
/*
|
||||
@@ -2166,7 +2166,7 @@ TclInitDoubleConversion(void)
|
||||
} bitwhack;
|
||||
#endif
|
||||
|
||||
-#if defined(__mips)
|
||||
+#if defined(__sgi) && defined(_COMPILER_VERSION)
|
||||
union fpc_csr mipsCR;
|
||||
|
||||
mipsCR.fc_word = get_fpc_csr();
|
||||
Loading…
Reference in New Issue