diff options
Diffstat (limited to 'package/tcl')
| -rw-r--r-- | package/tcl/Config.in | 8 | ||||
| -rw-r--r-- | package/tcl/Makefile | 13 | ||||
| -rw-r--r-- | package/tcl/patches/patch-generic_tclStrToD_c | 30 | ||||
| -rw-r--r-- | package/tcl/patches/patch-unix_Makefile_in | 21 |
4 files changed, 57 insertions, 15 deletions
diff --git a/package/tcl/Config.in b/package/tcl/Config.in deleted file mode 100644 index 292b447e9..000000000 --- a/package/tcl/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_PACKAGE_TCL - prompt "tcl............................... TCL" - tristate - default n - help - The TCL scripting language. - - http://www.tcl.tk/ diff --git a/package/tcl/Makefile b/package/tcl/Makefile index ec8777be4..3eb849626 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcl -PKG_VERSION:= 8.4.18 +PKG_VERSION:= 8.5.8 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7d8bc95036f797b1a2b62a5a382d2cc1 -PKG_DESCR:= the TCL scripting language +PKG_MD5SUM:= 7f123e53b3daaaba2478d3af5a0752e3 +PKG_DESCR:= TCL scripting language PKG_SECTION:= lang PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tcl/} @@ -19,19 +19,18 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,TCL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu +TCFLAGS+= -ldl CONFIGURE_ENV+= tcl_cv_strstr_unbroken=ok \ tcl_cv_strtod_buggy=ok \ tcl_cv_strtod_unbroken=ok \ tcl_cv_strtoul_unbroken=ok CONFIGURE_ARGS+= --enable-man-symlinks -BUILD_STYLE= auto -INSTALL_STYLE= auto +INSTALL_TARGET= install-binaries install-libraries post-install: ${INSTALL_DIR} ${IDIR_TCL}/usr/lib ${IDIR_TCL}/usr/bin ${CP} ${WRKINST}/usr/bin/* ${IDIR_TCL}/usr/bin ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_TCL}/usr/lib - chmod u+w ${IDIR_TCL}/usr/lib/libtcl8.4.so # for strip + chmod u+w ${IDIR_TCL}/usr/lib/libtcl8.5.so # for strip include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tcl/patches/patch-generic_tclStrToD_c b/package/tcl/patches/patch-generic_tclStrToD_c new file mode 100644 index 000000000..95eceecf7 --- /dev/null +++ b/package/tcl/patches/patch-generic_tclStrToD_c @@ -0,0 +1,30 @@ +--- tcl8.5.8.orig/generic/tclStrToD.c 2009-07-16 22:50:54.000000000 +0200 ++++ tcl8.5.8/generic/tclStrToD.c 2010-01-14 20:44:55.000000000 +0100 +@@ -73,9 +73,11 @@ 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) + #include <sys/fpu.h> + #endif ++*/ + /* + * HP's PA_RISC architecture uses 7ff4000000000000 to represent a quiet NaN. + * Everyone else uses 7ff8000000000000. (Why, HP, why?) +@@ -2166,6 +2168,7 @@ TclInitDoubleConversion(void) + } bitwhack; + #endif + ++/* + #if defined(__mips) + union fpc_csr mipsCR; + +@@ -2173,6 +2176,7 @@ TclInitDoubleConversion(void) + mipsCR.fc_struct.flush = 0; + set_fpc_csr(mipsCR.fc_word); + #endif ++*/ + + /* + * Initialize table of powers of 10 expressed as wide integers. diff --git a/package/tcl/patches/patch-unix_Makefile_in b/package/tcl/patches/patch-unix_Makefile_in new file mode 100644 index 000000000..7c4a9ca93 --- /dev/null +++ b/package/tcl/patches/patch-unix_Makefile_in @@ -0,0 +1,21 @@ +--- tcl8.5.8.orig/unix/Makefile.in 2009-11-13 19:38:45.000000000 +0100 ++++ tcl8.5.8/unix/Makefile.in 2009-11-20 21:59:51.000000000 +0100 +@@ -101,7 +101,8 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ + #CFLAGS = $(CFLAGS_DEBUG) + #CFLAGS = $(CFLAGS_OPTIMIZE) + #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) +-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ ++#CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ ++CFLAGS = @CFLAGS@ + + # Flags to pass to the linker + LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ +@@ -745,7 +746,7 @@ install-binaries: binaries + fi + @EXTRA_INSTALL_BINARIES@ + +-install-libraries: libraries $(INSTALL_TZDATA) install-msgs ++install-libraries: libraries + @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \ + do \ + if [ ! -d "$$i" ] ; then \ |